| commit | bc74c915c88f730c0e5289a3338ae4f4117384a4 | [log] [tgz] |
|---|---|---|
| author | Andrei-Valentin Onea <andreionea@google.com> | Wed Sep 30 14:02:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 30 14:02:29 2020 +0000 |
| tree | bda9717db874cb959bad037248763961f1a7baae | |
| parent | ccc36d6a462a7d25ccc726a411d22bd9e2302ebf [diff] | |
| parent | 3a5b1a12c538027710b195900c7ebb9bded39dd2 [diff] |
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
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() {