Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ccdf0ee authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am 0de66314: am 6916c6ee: Merge "Do not hang in pm clear on an invalid package... 

am 0de66314: am 6916c6ee: Merge "Do not hang in pm clear on an invalid package name" into jb-mr2-dev

* commit '0de66314':
  Do not hang in pm clear on an invalid package name
parents aa8a2e46 0de66314

cmds/pm/src/com/android/commands/pm/Pm.java

+1 −4
Original line number Diff line number Diff line
@@ -1149,10 +1149,7 @@ public final class Pm { 


        ClearDataObserver obs = new ClearDataObserver();

        try {

            if (!ActivityManagerNative.getDefault().clearApplicationUserData(pkg, obs, userId)) {

                System.err.println("Failed");

            }



            ActivityManagerNative.getDefault().clearApplicationUserData(pkg, obs, userId);

            synchronized (obs) {

                while (!obs.finished) {

                    try {

services/java/com/android/server/am/ActivityManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -3516,6 +3516,13 @@ public final class ActivityManagerService extends ActivityManagerNative 
                }

                if (pkgUid == -1) {

                    Slog.w(TAG, "Invalid packageName: " + packageName);

                    if (observer != null) {

                        try {

                            observer.onRemoveCompleted(packageName, false);

                        } catch (RemoteException e) {

                            Slog.i(TAG, "Observer no longer exists.");

                        }

                    }

                    return false;

                }

                if (uid == pkgUid || checkComponentPermission(