Merge "Fix compat change CTS test flakiness" am: bb0db1d243 am: 3d1cfa54d6 am: 1fe983edb7 am: 3a5b1a12c5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440635 Change-Id: I60cfbb9a875fb2e7f0759b84732f9172ed97cdf0
2020-09-30 14:02:29 +00:00
parent ccc36d6a46 3a5b1a12c5
commit bc74c915c8
1 changed files with 4 additions and 1 deletions
--- a/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt
+++ b/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt
@@ -107,7 +107,10 @@ class PlatformCompatCommandNotInstalledTest {
    fun ParcelFileDescriptor.text() = FileReader(fileDescriptor).readText()

    @After
-    fun resetIdentity() = uiAutomation.dropShellPermissionIdentity()
+    fun resetChangeIdAndIdentity() {
+        command("am compat reset $TEST_CHANGE_ID $TEST_PKG")
+        uiAutomation.dropShellPermissionIdentity()
+    }

    @Test
    fun execute() {