LocationProviderInterceptDialogTest - Don't run on auto/tv/watch
This test is currently failing on tv. But, the LocationProviderInterceptDialog is only invoked from handheld, so don't run it on auto, tv, or watch.
Also, add FLAG_ACTIVITY_CLEAR_TASK when opening the ACTION_MANAGE_APP_PERMISSIONS screen. This clears the screen if it is already open, prevent rare intermittent failures.
Test: atest LocationProviderInterceptDialogTest
Fix: 279183829
Change-Id: Ibc1335938ed26415088426560ca5e914face0088
diff --git a/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt b/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
index 3c33f280..eaa34f9 100644
--- a/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/LocationProviderInterceptDialogTest.kt
@@ -29,6 +29,7 @@
import com.android.compatibility.common.util.SystemUtil
import java.util.concurrent.TimeUnit
import org.junit.Assert
+import org.junit.Assume.assumeFalse
import org.junit.Before
import org.junit.Test
@@ -44,6 +45,9 @@
class LocationProviderInterceptDialogTest : BaseUsePermissionTest() {
@Before
fun setup() {
+ assumeFalse(isAutomotive)
+ assumeFalse(isTv)
+ assumeFalse(isWatch)
installPackage(MIC_LOCATION_PROVIDER_APP_APK_PATH, grantRuntimePermissions = true)
AppOpsUtils.setOpMode(
MIC_LOCATION_PROVIDER_APP_PACKAGE_NAME,
@@ -86,6 +90,7 @@
context.startActivity(
Intent(ACTION_MANAGE_APP_PERMISSIONS).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+ addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
putExtra(EXTRA_PACKAGE_NAME, MIC_LOCATION_PROVIDER_APP_PACKAGE_NAME)
}
)
