Merge "Fix compat change CTS test flakiness"

2020-09-30 12:13:24 +00:00
parent 19189d886b 34a78c50b0
commit bb0db1d243
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() {