commit 5eb32dc28f4d6e6173989b17135f3844269c3e86
author xiaodong.zhang <xiaodong.zhang@sony.com> Tue Jan 23 11:40:33 2018 +0800
committer Koji Fukui <koji.fukui@sony.com> Wed Feb 28 18:15:37 2018 +0900
tree 71b82686246eb7d3794bab0abfa797e49ef597a7
parent 9baa92a8ff0d0a6f5de4cff758aa7bad1d2e9b01

Handle IAE in deletePackageAsUser

Root cause:
If user click free up button twice continully, the frist
clear data thread is running at background. When second clear data
thread is running, it will delete the same package that was deleted
by first thread. So StorageManager throw the IllegalArgumentException
and crash.

Solution:
The similar with b/31706903, Handle IAE in StorageManager.
Add try-catch at PackageManager.deletePackageAsUser().

Bug: 73979017
Change-Id: I200e93e4e7d7b34aac5bbca78804effa7a78c74b

src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java

diff --git a/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java b/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
index 32fc09f..07e73b7 100644
--- a/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
+++ b/src/com/android/storagemanager/deletionhelper/PackageDeletionTask.java
@@ -19,6 +19,7 @@
 import android.content.pm.IPackageDeleteObserver;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
+import android.util.Log;
 
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -27,6 +28,7 @@
  * Deletes a specified set of apps as a specified user and calls back once done.
  */
 public class PackageDeletionTask {
+    private static final String TAG = "PackageDeletionTask";
     private Set<String> mPackages;
     private Callback mCallback;
     private PackageManager mPm;
@@ -46,7 +48,12 @@
     public void run() {
         PackageDeletionObserver observer = new PackageDeletionObserver(mPackages.size());
         for (String packageName : mPackages) {
-            mPm.deletePackageAsUser(packageName, observer, 0, mUser.getIdentifier());
+            try {
+                mPm.deletePackageAsUser(packageName, observer, 0, mUser.getIdentifier());
+            } catch (IllegalArgumentException e) {
+                // Couldn't find the package, no need to delete.
+                Log.w(TAG, "Could not find package, not deleting " + packageName, e);
+            }
         }
     }