Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30c0b834: am d9d25760: Remove dead locks in system process when installing packages

Browse Source 
Merge commit '30c0b83490d856c1cd82441c8e2d800a88927237'

* commit '30c0b83490d856c1cd82441c8e2d800a88927237':
  Remove dead locks in system process when installing packages
This commit is contained in:
Suchi Amalapurapu
2009-08-18 13:05:27 -07:00
committed by Android Git Automerger
parent d2f23c959a 30c0b83490
commit 5cc9db4206
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -930,6 +930,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
static final int RESUME_TOP_ACTIVITY_MSG = 19;
static final int PROC_START_TIMEOUT_MSG = 20;
static final int DO_PENDING_ACTIVITY_LAUNCHES_MSG = 21;
static final int KILL_APPLICATION_MSG = 22;
AlertDialog mUidAlert;
@@ -1159,6 +1160,14 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
doPendingActivityLaunchesLocked(true);
}
}
case KILL_APPLICATION_MSG: {
synchronized (ActivityManagerService.this) {
int uid = msg.arg1;
boolean restart = (msg.arg2 == 1);
String pkg = (String) msg.obj;
uninstallPackageLocked(pkg, uid, restart);
}
} break;
}
}
};
@@ -4810,7 +4819,12 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
int callerUid = Binder.getCallingUid();
// Only the system server can kill an application
if (callerUid == Process.SYSTEM_UID) {
uninstallPackageLocked(pkg, uid, false);
// Post an aysnc message to kill the application
Message msg = mHandler.obtainMessage(KILL_APPLICATION_MSG);
msg.arg1 = uid;
msg.arg2 = 0;
msg.obj = pkg;
mHandler.dispatchMessage(msg);
} else {
throw new SecurityException(callerUid + " cannot kill pkg: " +
pkg);