commit 3ff26d9990ca2655d8acc1c34a95b235c4736669
author Sterling Huber <hubers@google.com> Wed May 20 15:11:16 2020 -0700
committer JP Sugarbroad <jpsugar@google.com> Wed Jun 03 16:17:38 2020 -0700
tree 7ba98e6d45a640358522cc575738da98b32d9895
parent 54c44a73d707a0298e7daf42be125df9fa8ab3ff

RESTRICT AUTOMERGE Adding MANAGE_COMPANION_DEVICES to permissions to skip on older
versions of the code.

Test: PermissionPolicyTest toggling PLATFORM_SECURITY_PATCH in
build/make/core/version_defaults.mk

Bug: 129476618

Change-Id: I20405787761b37064644f9639c9644d674d1fd3c
(cherry picked from commit 5e3e117afb2b36604846a6e3c130e8071d2f4f51)

tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java

diff --git a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
index 2888a71..6e25b15 100644
--- a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
@@ -52,6 +52,10 @@
     private static final String HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PERMISSION
             = "android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS";
 
+    private static final Date MANAGE_COMPANION_DEVICES_PATCH_DATE = parseDate("2020-07-01");
+    private static final String MANAGE_COMPANION_DEVICES_PERMISSION
+            = "android.Manifest.permission.MANAGE_COMPANION_DEVICES";
+
     private static final String LOG_TAG = "PermissionProtectionTest";
 
     private static final String PLATFORM_PACKAGE_NAME = "android";
@@ -302,8 +306,13 @@
     }
 
     private boolean shouldSkipPermission(String permissionName) {
-        return parseDate(SECURITY_PATCH).before(HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PATCH_DATE) &&
-                HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PERMISSION.equals(permissionName);
-
+        switch (permissionName) {
+            case HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PERMISSION:
+                return parseDate(SECURITY_PATCH).before(HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PATCH_DATE);
+            case MANAGE_COMPANION_DEVICES_PERMISSION:
+                return parseDate(SECURITY_PATCH).before(MANAGE_COMPANION_DEVICES_PATCH_DATE);
+            default:
+                return false;
+        }
     }
 }