Check whether a system app is installed before trying to uninstall it am: a2b2ba7289

Original change: https://android-review.googlesource.com/c/platform/test/app_compat/csuite/+/1584432

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ed347736d1c55fc180aa1a68439e8ede0fa1fcc

1 files changed, 6 insertions, 1 deletions

diff --git a/harness/src/main/java/com/android/compatibility/targetprep/SystemAppRemovalPreparer.java b/harness/src/main/java/com/android/compatibility/targetprep/SystemAppRemovalPreparer.java
index d5438cc..8ab58d6 100644
--- a/harness/src/main/java/com/android/compatibility/targetprep/SystemAppRemovalPreparer.java
+++ b/harness/src/main/java/com/android/compatibility/targetprep/SystemAppRemovalPreparer.java
@@ -61,13 +61,18 @@ public final class SystemAppRemovalPreparer implements ITargetPreparer {
             throws TargetSetupError, DeviceNotAvailableException {
         checkNotNull(mPackageName);
 
+        if (!isPackageInstalled(mPackageName, device)) {
+            CLog.i("Package %s is not installed.", mPackageName);
+            return;
+        }
+
         // Attempts to uninstall the package/updates from user partition.
         // This method should be called before the other methods and requires
         // the framework to be running.
         removePackageUpdates(mPackageName, device);
 
         if (!isPackageInstalled(mPackageName, device)) {
-            CLog.i("Package %s is not installed.", mPackageName);
+            CLog.i("Package %s has been removed.", mPackageName);
             return;
         }