summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/cts/permissionmultidevice/Android.bp1
-rw-r--r--tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt4
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/cts/permissionmultidevice/Android.bp b/tests/cts/permissionmultidevice/Android.bp
index 2d2956ff6..61ac6541d 100644
--- a/tests/cts/permissionmultidevice/Android.bp
+++ b/tests/cts/permissionmultidevice/Android.bp
@@ -34,7 +34,6 @@ android_test {
"modules-utils-build_system",
"cts-wm-util",
"flag-junit",
- "CtsVirtualDeviceCommonLib",
"android.companion.virtual.flags-aconfig-java",
"permission-test-util-lib",
"permission-multidevice-test-util-lib",
diff --git a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
index c6e27120a..c37b71cd4 100644
--- a/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
+++ b/tests/cts/permissionmultidevice/src/android/permissionmultidevice/cts/DeviceAwarePermissionGrantTest.kt
@@ -17,6 +17,7 @@
package android.permissionmultidevice.cts
import android.Manifest
+import android.app.ActivityOptions
import android.app.Instrumentation
import android.content.ComponentName
import android.content.Intent
@@ -33,7 +34,6 @@ import android.permissionmultidevice.cts.UiAutomatorUtils.waitFindObject
import android.platform.test.annotations.RequiresFlagsEnabled
import android.platform.test.flag.junit.DeviceFlagsValueProvider
import android.view.Display
-import android.virtualdevice.cts.common.util.VirtualDeviceTestUtils
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
import androidx.test.platform.app.InstrumentationRegistry
@@ -176,7 +176,7 @@ class DeviceAwarePermissionGrantTest {
}
private fun requestPermissionOnDevice(displayId: Int, targetDeviceId: Int) {
- val options = VirtualDeviceTestUtils.createActivityOptions(displayId)
+ val options = ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle()
val intent =
Intent()