Merge "Fix for testPackageSignatures failure in full run" into android14-tests-devandroid14-tests-dev

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt b/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
index def00ed2ea9..8ee509579bc 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AttributionTest.kt
@@ -109,6 +109,7 @@ class AttributionTest {
                     .isEqualTo(before.attributedOpEntries[ATTRIBUTION_3]!!
                             .getLastAccessTime(OP_FLAGS_ALL))
         }
+        runCommand("pm uninstall $PKG")
     }
 
     @Test
diff --git a/tests/tests/appop/src/android/app/appops/cts/RuntimeMessageCollectionTest.kt b/tests/tests/appop/src/android/app/appops/cts/RuntimeMessageCollectionTest.kt
index 079d7f489c9..89199ad51dd 100644
--- a/tests/tests/appop/src/android/app/appops/cts/RuntimeMessageCollectionTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/RuntimeMessageCollectionTest.kt
@@ -22,6 +22,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertThat
 import org.junit.Assert.fail
 import org.junit.Before
+import org.junit.After;
 import org.junit.Test
 import java.lang.Thread.sleep
 
@@ -49,6 +50,11 @@ class RuntimeMessageCollectionTest {
         installApk("CtsAppToCollect.apk")
     }
 
+    @After
+    fun uninstallTestApp() {
+        runCommand("pm uninstall $APP_PKG")
+    }
+
     @Test
     fun collectAsyncStackTrace() {
         installApk("CtsAppToCollect.apk")