Handle exception when removing package

Handles IllegalArgumentException from the deletePackage call.
It's unclear right now what the root cause of this crash is,
but we will follow up with that in a future release.

BUG: 31425541
Change-Id: I24eba7c06f090dd6dcd2f75268cd6be1d1f2f500

1 files changed, 10 insertions, 3 deletions

diff --git a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java
index 25ccac4c..6f4e2bcf 100644
--- a/src/com/android/packageinstaller/wear/WearPackageInstallerService.java
+++ b/src/com/android/packageinstaller/wear/WearPackageInstallerService.java
@@ -361,13 +361,20 @@ public class WearPackageInstallerService extends Service {
 
             // Found package, send uninstall request.
             PowerManager.WakeLock lock = getLock(this.getApplicationContext());
-            pm.deletePackage(packageName, new PackageDeleteObserver(lock, startId),
-                     PackageManager.DELETE_ALL_USERS);
+
+            try {
+                pm.deletePackage(packageName, new PackageDeleteObserver(lock, startId),
+                        PackageManager.DELETE_ALL_USERS);
+            } catch (IllegalArgumentException e) {
+                // Couldn't find the package, no need to call uninstall.
+                Log.w(TAG, "Could not find package, not deleting " + packageName, e);
+            }
+
             startPermsServiceForUninstall(packageName);
             Log.i(TAG, "Sent delete request for " + packageName);
         } catch (PackageManager.NameNotFoundException e) {
             // Couldn't find the package, no need to call uninstall.
-            Log.w(TAG, "Could not find package, not deleting " + packageName);
+            Log.w(TAG, "Could not find package, not deleting " + packageName, e);
         }
     }