commit bb0db1d243554a87f6320936a0901238396cda37
author Andrei-Valentin Onea <andreionea@google.com> Wed Sep 30 12:13:24 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 30 12:13:24 2020 +0000
tree 7cfb49dbb57a67aaa2aecdd0e0d4254b25f2d4b3
parent 19189d886b32928e9da0c96108310a42c0db2c1f
parent 34a78c50b04e282a2220ed84713b29881fd8765a

Merge "Fix compat change CTS test flakiness"

tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt

diff --git a/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt b/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt
index 0f62c4f..e9227e94 100644
--- a/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt
+++ b/tests/PlatformCompatGating/src/com/android/tests/gating/PlatformCompatCommandNotInstalledTest.kt
@@ -107,7 +107,10 @@
     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() {