diff options
| -rw-r--r-- | tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java index e8de02d79ef..61dd66ba671 100644 --- a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java +++ b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java @@ -90,8 +90,15 @@ public class PermissionPolicyTest extends AndroidTestCase { // OEMs cannot change permission protection flags final int expectedProtectionFlags = expectedPermission.protectionLevel & PermissionInfo.PROTECTION_MASK_FLAGS; - final int declaredProtectionFlags = declaredPermission.protectionLevel + int declaredProtectionFlags = declaredPermission.protectionLevel & PermissionInfo.PROTECTION_MASK_FLAGS; + // Device makers are allowed to backport the framework fix on nougat mr1 + // https://android.googlesource.com/platform/frameworks/base/+/b2457c + if (expectedPermissionName.equals("android.permission.PEERS_MAC_ADDRESS") + && declaredProtectionFlags == 0) + { + declaredProtectionFlags = PermissionInfo.PROTECTION_FLAG_SETUP; + } assertEquals("Permission " + expectedPermissionName + " invalid enforced protection" + " level flags", expectedProtectionFlags, declaredProtectionFlags); |