drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '6916c6ee105e7e91f494ec79c24152fb64d8eed1':
  Do not hang in pm clear on an invalid package name
This commit is contained in:
Christopher Tate
2013-03-08 02:06:59 +00:00
committed by Android Git Automerger
parent fe8b6efbb4 6916c6ee10
commit 0de6631450
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/pm/src/com/android/commands/pm/Pm.java
View File

@ -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 {

9
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -3499,7 +3499,14 @@ public final class ActivityManagerService extends ActivityManagerNative
} catch (RemoteException e) {
}
if (pkgUid == -1) {
Slog.w(TAG, "Invalid packageName:" + packageName);
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(