Merge "Fix DeviceAwarePermissionGrantTest test failures" into main

3 files changed, 8 insertions, 3 deletions

diff --git a/tests/cts/permissionmultidevice/AndroidManifest.xml b/tests/cts/permissionmultidevice/AndroidManifest.xml
index e7c993d57..9bad85813 100644
--- a/tests/cts/permissionmultidevice/AndroidManifest.xml
+++ b/tests/cts/permissionmultidevice/AndroidManifest.xml
@@ -20,6 +20,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.permissionmultidevice.cts">
 
+    <uses-feature android:name="android.software.companion_device_setup" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
diff --git a/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/FakeVirtualDeviceRule.kt b/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/FakeVirtualDeviceRule.kt
index 0eff95a3d..e8d35e614 100644
--- a/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/FakeVirtualDeviceRule.kt
+++ b/tests/cts/permissionmultidevice/TestUtils/src/android/permissionmultidevice/cts/FakeVirtualDeviceRule.kt
@@ -26,6 +26,7 @@ class FakeVirtualDeviceRule : FakeAssociationRule() {
 
     private lateinit var virtualDeviceManager: VirtualDeviceManager
     lateinit var virtualDevice: VirtualDeviceManager.VirtualDevice
+    lateinit var deviceDisplayName: String
     var virtualDisplayId: Int = -1
 
     override fun before() {
@@ -57,6 +58,10 @@ class FakeVirtualDeviceRule : FakeAssociationRule() {
                 )
             Truth.assertThat(display).isNotNull()
             virtualDisplayId = display!!.display.displayId
+            deviceDisplayName =
+                virtualDeviceManager
+                    .getDisplayNameForPersistentDeviceId(virtualDevice.persistentDeviceId!!)
+                    .toString()
         }
     }
 
diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
index 09f4c7f08..b3efa36cb 100644
--- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
+++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
@@ -94,7 +94,7 @@ class DeviceAwarePermissionGrantTest {
             Display.DEFAULT_DISPLAY,
             mFakeVirtualDeviceRule.virtualDevice.deviceId,
             true,
-            DEFAULT_REMOTE_DEVICE_NAME,
+            mFakeVirtualDeviceRule.deviceDisplayName,
             expectPermissionGrantedOnDefaultDevice = false,
             expectPermissionGrantedOnRemoteDevice = true
         )
@@ -120,7 +120,7 @@ class DeviceAwarePermissionGrantTest {
             mFakeVirtualDeviceRule.virtualDisplayId,
             mFakeVirtualDeviceRule.virtualDevice.deviceId,
             true,
-            DEFAULT_REMOTE_DEVICE_NAME,
+            mFakeVirtualDeviceRule.deviceDisplayName,
             expectPermissionGrantedOnDefaultDevice = false,
             expectPermissionGrantedOnRemoteDevice = true
         )
@@ -199,7 +199,6 @@ class DeviceAwarePermissionGrantTest {
         const val APP_APK_PATH_STREAMING = "${APK_DIRECTORY}/CtsAccessRemoteDeviceCamera.apk"
         const val APP_PACKAGE_NAME = "android.permissionmultidevice.cts.accessremotedevicecamera"
         const val PERMISSION_MESSAGE_ID = "com.android.permissioncontroller:id/permission_message"
-        const val DEFAULT_REMOTE_DEVICE_NAME = "remote device"
         const val ALLOW_BUTTON =
             "com.android.permissioncontroller:id/permission_allow_foreground_only_button"
         const val DEVICE_ID_DEFAULT = 0