From a6262d8b9a9fa9c0fab2319db9dcbe6a5347c48f Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Thu, 2 Dec 2021 15:50:03 +0800
Subject: [PATCH] Fix flaky tests (3/n)

The next test will have wrong initial conditions if the test apps
installed by the previous test are not removed.

Bug: 173194203
Test: atest StagedInstallInternalTest
Change-Id: I879324e5e046e34d97030c0d3a09f81cee26c3ee
---
 .../tests/stagedinstallinternal/StagedInstallInternalTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java b/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java
index da5468e48f194..b21d7b5d1f4a5 100644
--- a/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java
+++ b/tests/StagedInstallTest/app/src/com/android/tests/stagedinstallinternal/StagedInstallInternalTest.java
@@ -44,6 +44,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import com.android.cts.install.lib.Install;
 import com.android.cts.install.lib.InstallUtils;
 import com.android.cts.install.lib.TestApp;
+import com.android.cts.install.lib.Uninstall;
 
 import org.junit.After;
 import org.junit.Before;
@@ -108,6 +109,7 @@ public class StagedInstallInternalTest {
     @Test
     public void cleanUp() throws Exception {
         Files.deleteIfExists(mTestStateFile.toPath());
+        Uninstall.packages(TestApp.A, TestApp.B);
     }
 
     @Test