Put device aware permission test cases behind the new feature flag

These test cases need CAMERA or RECORD_AUDIO permissions to be device aware, which now is controlled by device_aware_permissions_allowlist_enabled
flag.

Bug: 324549706
Test: atest DevicePermissionsTest, atest DeviceAwarePermissionGrantTest
Change-Id: Ie16b372901fda88b741fcb5d67fb11139f7cceb1

2 files changed, 33 insertions, 9 deletions

diff --git a/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt b/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt
index 01b5a64ed..2efc6718e 100644
--- a/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt
+++ b/tests/cts/permission/src/android/permission/cts/DevicePermissionsTest.kt
@@ -101,13 +101,16 @@ class DevicePermissionsTest {
         virtualDevice.close()
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun testDeviceAwareRuntimePermissionIsGranted() {
         grantPermissionAndAssertGranted(Manifest.permission.CAMERA, virtualDeviceContext)
     }
 
-    @RequiresFlagsDisabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsDisabled(Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED)
     @Test
     fun testDeviceAwareRuntimePermissionGrantIsInherited() {
         grantPermissionAndAssertGranted(Manifest.permission.CAMERA, defaultDeviceContext)
@@ -126,7 +129,10 @@ class DevicePermissionsTest {
         )
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun testDeviceAwareRuntimePermissionIsRevoked() {
         grantPermissionAndAssertGranted(Manifest.permission.RECORD_AUDIO, virtualDeviceContext)
@@ -184,6 +190,10 @@ class DevicePermissionsTest {
         }
     }
 
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun testRevokeSelfPermissionOnKill() {
         grantPermissionAndAssertGranted(Manifest.permission.RECORD_AUDIO, virtualDeviceContext)
@@ -198,7 +208,10 @@ class DevicePermissionsTest {
         }
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun testGrantAndRevokeDeviceAwarePermissionByPersistentDeviceId() {
         val deviceAwarePermission = Manifest.permission.RECORD_AUDIO
@@ -247,7 +260,10 @@ class DevicePermissionsTest {
             .isEqualTo(PERMISSION_DENIED)
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun testUpdateAndGetPermissionFlagsByPersistentDeviceId() {
         val deviceAwarePermission = Manifest.permission.RECORD_AUDIO
diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
index 2d03fbc25..359b4e5fd 100644
--- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
+++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
@@ -76,7 +76,6 @@ class DeviceAwarePermissionGrantTest {
         uninstallPackage(APP_PACKAGE_NAME, requireSuccess = false)
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
     @Test
     fun onHostDevice_requestPermissionForHostDevice_shouldGrantPermission() {
         testGrantPermissionForDevice(
@@ -89,7 +88,10 @@ class DeviceAwarePermissionGrantTest {
         )
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun onHostDevice_requestPermissionForRemoteDevice_shouldGrantPermission() {
         testGrantPermissionForDevice(
@@ -102,7 +104,10 @@ class DeviceAwarePermissionGrantTest {
         )
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun onRemoteDevice_requestPermissionForHostDevice_shouldGrantPermission() {
         testGrantPermissionForDevice(
@@ -115,7 +120,10 @@ class DeviceAwarePermissionGrantTest {
         )
     }
 
-    @RequiresFlagsEnabled(Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED)
+    @RequiresFlagsEnabled(
+        Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
+        Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED
+    )
     @Test
     fun onRemoteDevice_requestPermissionForRemoteDevice_shouldGrantPermission() {
         testGrantPermissionForDevice(