| commit | c6b03b50fa2200e228c5c9d115c1d91061b6602c | [log] [tgz] |
|---|---|---|
| author | JP Sugarbroad <jpsugar@google.com> | Thu Jul 09 11:41:06 2020 -0700 |
| committer | JP Sugarbroad <jpsugar@google.com> | Thu Jul 09 11:42:37 2020 -0700 |
| tree | 75d0e3997d246d95d0968cf60f3f0313b6d154d1 | |
| parent | 92327f668f15ddf670a62e2eefb495a5a4dc5267 [diff] |
Allow an SPL-gated permission to be added early. Bug: 155814979 Change-Id: I3647fa7392c1374671b2b8adaa1faff1ac68aecf
diff --git a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java index 16b8623..94931f9 100644 --- a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java +++ b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
@@ -83,6 +83,11 @@ for (PermissionInfo expectedPermission : loadExpectedPermissions()) { String expectedPermissionName = expectedPermission.name; if (shouldSkipPermission(expectedPermissionName)) { + // This permission doesn't need to exist yet, but will exist in + // a future SPL. It is acceptable to declare the permission + // even in an earlier SPL, so we remove it here so it doesn't + // trigger a failure after the loop. + declaredPermissionsMap.remove(expectedPermissionName); continue; }