From 15157ecddc710791e9d803f3bbadce6288c8123d Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Tue, 4 May 2021 10:05:04 +0800
Subject: [PATCH] Uninstall test apps in-between tests

Don't leave an unclean state to the next test.

Bug: 187123877
Test: atest MultiUserRollbackTest#testMultipleUsers --rerun-until-failure 2
Change-Id: I6c680ef81131c8023013630219124f609c9d5bf7
---
 .../com/android/tests/rollback/host/MultiUserRollbackTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java b/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java
index 741745560c61a..35859fe1472e4 100644
--- a/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java
+++ b/tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java
@@ -48,6 +48,8 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test {
     public void tearDown() throws Exception {
         removeSecondaryUserIfNecessary();
         runPhaseForUsers("cleanUp", mOriginalUserId);
+        uninstallPackage("com.android.cts.install.lib.testapp.A");
+        uninstallPackage("com.android.cts.install.lib.testapp.B");
     }
 
     @Before