Merge "Clear permission decisions task before launching" into main

1 files changed, 16 insertions, 9 deletions

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt
index ae6e33b2a..e4ee52186 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt
@@ -53,7 +53,8 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
         openPermissionDecisions()
         waitFindObject(
             By.hasChild(
-                    By.text("You gave $APP_PACKAGE_NAME access to location").displayId(displayId))
+                    By.text("You gave $APP_PACKAGE_NAME access to location").displayId(displayId)
+                )
                 .hasChild(By.text("Today").displayId(displayId))
                 .displayId(displayId)
         )
@@ -69,7 +70,8 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
         openPermissionDecisions()
         waitFindObject(
             By.hasChild(
-                    By.text("You denied $APP_PACKAGE_NAME access to location").displayId(displayId))
+                    By.text("You denied $APP_PACKAGE_NAME access to location").displayId(displayId)
+                )
                 .hasChild(By.text("Today").displayId(displayId))
                 .displayId(displayId)
         )
@@ -86,11 +88,13 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
         openPermissionDecisions()
         assertNull(
             waitFindObjectOrNull(
-                By.hasChild(By.text("You denied $APP_PACKAGE_NAME access to location")
-                        .displayId(displayId))
+                By.hasChild(
+                        By.text("You denied $APP_PACKAGE_NAME access to location")
+                            .displayId(displayId)
+                    )
                     .hasChild(By.text("Today").displayId(displayId))
                     .displayId(displayId),
-                ASSERT_ABSENT_SELECTOR_TIMEOUT_MS
+                ASSERT_ABSENT_SELECTOR_TIMEOUT_MS,
             )
         )
     }
@@ -105,8 +109,10 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
         openPermissionDecisions()
 
         waitFindObject(
-                By.hasChild(By.text("You gave $APP_PACKAGE_NAME access to location")
-                        .displayId(displayId))
+                By.hasChild(
+                        By.text("You gave $APP_PACKAGE_NAME access to location")
+                            .displayId(displayId)
+                    )
                     .hasChild(By.text("Today").displayId(displayId))
                     .displayId(displayId)
             )
@@ -121,7 +127,8 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
         pressBack()
         waitFindObject(
             By.hasChild(
-                    By.text("You denied $APP_PACKAGE_NAME access to location").displayId(displayId))
+                    By.text("You denied $APP_PACKAGE_NAME access to location").displayId(displayId)
+                )
                 .hasChild(By.text("Today").displayId(displayId))
                 .displayId(displayId)
         )
@@ -132,7 +139,7 @@ class PermissionDecisionsTest : BaseUsePermissionTest() {
             SystemUtil.runWithShellPermissionIdentity {
                 context.startActivity(
                     Intent(PermissionManager.ACTION_REVIEW_PERMISSION_DECISIONS).apply {
-                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
                     }
                 )
             }