Snap for 13235988 from cf08d44ebd5887c86dddc28f04fb940439fd822e to 25Q2-release

Change-Id: Iaeee730644bb03fdd49023281c791dc100ada4b0

2 files changed, 17 insertions, 7 deletions

diff --git a/PermissionController/tests/permissionui/AndroidTest.xml b/PermissionController/tests/permissionui/AndroidTest.xml
index 9cadbd12f..2462dc4c7 100644
--- a/PermissionController/tests/permissionui/AndroidTest.xml
+++ b/PermissionController/tests/permissionui/AndroidTest.xml
@@ -63,6 +63,12 @@
             value="/data/local/tmp/pc-permissionui/PermissionUiUseReadHeartRatePermissionApp.apk" />
     </target_preparer>
 
+    <!-- Wake the screen, and dismiss keyguard -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <option name="run-command" value="wm dismiss-keyguard" />
+    </target_preparer>
+
     <!-- Uninstall test-apps -->
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="teardown-command" value="pm uninstall android.permission.cts.appthatrequestpermission" />
diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
index e1068e19a..0f6504502 100644
--- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
+++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
@@ -62,13 +62,8 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-@SdkSuppress(minSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM, codeName = "VanillaIceCream")
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
 @AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
-@RequiresFlagsEnabled(
-    Flags.FLAG_DEVICE_AWARE_PERMISSION_APIS_ENABLED,
-    Flags.FLAG_DEVICE_AWARE_PERMISSIONS_ENABLED,
-    Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES,
-)
 open class DeviceAwarePermissionGrantTest {
     private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
     private val defaultDeviceContext = instrumentation.targetContext
@@ -273,7 +268,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
-    // TODO: Receives PERMISSION_DENIED but it's fine if remote permission is held??
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermission_onRemote_requestHostPermission() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM)
@@ -289,6 +284,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermission_onRemote_withRemotePermission_requestHostPermission() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_CUSTOM)
@@ -334,6 +330,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermissionWithoutCapability_onHost_requestRemotePermission() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT)
@@ -349,6 +346,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermissionWithoutCapability_onRemote_requestRemotePermission() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT)
@@ -364,6 +362,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermissionWithoutCapability_onRemote_requestPermissionWithoutDeviceId() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT)
@@ -379,6 +378,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun deviceAwarePermissionWithoutCapability_onRemote_requestHostPermission() {
         createVirtualDevice(cameraPolicy = DEVICE_POLICY_DEFAULT)
@@ -424,6 +424,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun nonDeviceAwarePermission_onHost_requestRemotePermission() {
         createVirtualDevice()
@@ -439,6 +440,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun nonDeviceAwarePermission_onRemote_requestRemotePermission() {
         createVirtualDevice()
@@ -454,6 +456,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun nonDeviceAwarePermission_onRemote_requestPermissionWithoutDeviceId() {
         createVirtualDevice()
@@ -469,6 +472,7 @@ open class DeviceAwarePermissionGrantTest {
         )
     }
 
+    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_HOST_PERMISSION_DIALOGS_ON_VIRTUAL_DEVICES)
     @Test
     fun nonDeviceAwarePermission_onRemote_requestHostPermission() {
         createVirtualDevice()