Clean up old/hung test packages before reinstall

bug:27485065
Change-Id: Ib661e2cf889bc7c270f4c4284ac571773f39a8a3

1 files changed, 11 insertions, 5 deletions

diff --git a/src/com/android/tradefed/targetprep/TestAppInstallSetup.java b/src/com/android/tradefed/targetprep/TestAppInstallSetup.java
index 9c5137fae..52c05c5b1 100644
--- a/src/com/android/tradefed/targetprep/TestAppInstallSetup.java
+++ b/src/com/android/tradefed/targetprep/TestAppInstallSetup.java
@@ -149,6 +149,16 @@ public class TestAppInstallSetup implements ITargetCleaner, IAbiReceiver {
             if (abiName != null) {
                 mInstallArgs.add(String.format("--abi %s", abiName));
             }
+            AaptParser parser = AaptParser.parse(testAppFile);
+            if (parser == null) {
+                throw new TargetSetupError("AaptParser failed");
+            }
+            String testAppPkgName = parser.getPackageName();
+            if (device.getAppPackageInfo(testAppPkgName) != null) {
+                CLog.d("Package %s already present on device, uninstalling ...");
+                device.uninstallPackage(testAppPkgName);
+            }
+
             CLog.d("Installing apk from %s ...", testAppFile.getAbsolutePath());
             String result = device.installPackage(testAppFile, true,
                     mInstallArgs.toArray(new String[]{}));
@@ -158,11 +168,7 @@ public class TestAppInstallSetup implements ITargetCleaner, IAbiReceiver {
                                 device.getSerialNumber(), result));
             }
             if (mCleanup) {
-                AaptParser parser = AaptParser.parse(testAppFile);
-                if (parser == null) {
-                    throw new TargetSetupError("apk installed but AaptParser failed");
-                }
-                mPackagesInstalled.add(parser.getPackageName());
+                mPackagesInstalled.add(testAppPkgName);
             }
         }
     }