From 3dacd8470a55804fe267a901c6b9f243431e39e2 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Fri, 19 Aug 2011 14:56:15 -0700 Subject: [PATCH] Allow Instrumentation to kill even persistent processes Fixes bug 5117630 Change-Id: Iff40145fbbdc1d81a60cf2ecc5b24321162f7897 --- .../server/am/ActivityManagerService.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index cba04dffe6d3d..a7af8bab6fc8c 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -1074,7 +1074,7 @@ public final class ActivityManagerService extends ActivityManagerNative int uid = msg.arg1; boolean restart = (msg.arg2 == 1); String pkg = (String) msg.obj; - forceStopPackageLocked(pkg, uid, restart, false, true); + forceStopPackageLocked(pkg, uid, restart, false, true, false); } } break; case FINALIZE_PENDING_INTENT_MSG: { @@ -3086,7 +3086,7 @@ public final class ActivityManagerService extends ActivityManagerNative return; } killPackageProcessesLocked(packageName, pkgUid, - ProcessList.SECONDARY_SERVER_ADJ, false, true, true); + ProcessList.SECONDARY_SERVER_ADJ, false, true, true, false); } } finally { Binder.restoreCallingIdentity(callingId); @@ -3244,7 +3244,7 @@ public final class ActivityManagerService extends ActivityManagerNative } private void forceStopPackageLocked(final String packageName, int uid) { - forceStopPackageLocked(packageName, uid, false, false, true); + forceStopPackageLocked(packageName, uid, false, false, true, false); Intent intent = new Intent(Intent.ACTION_PACKAGE_RESTARTED, Uri.fromParts("package", packageName, null)); if (!mProcessesReady) { @@ -3257,7 +3257,8 @@ public final class ActivityManagerService extends ActivityManagerNative } private final boolean killPackageProcessesLocked(String packageName, int uid, - int minOomAdj, boolean callerWillRestart, boolean allowRestart, boolean doit) { + int minOomAdj, boolean callerWillRestart, boolean allowRestart, boolean doit, + boolean evenPersistent) { ArrayList procs = new ArrayList(); // Remove all processes this package may have touched: all with the @@ -3268,7 +3269,7 @@ public final class ActivityManagerService extends ActivityManagerNative final int NA = apps.size(); for (int ia=0; ia=0; i--) { ActivityRecord r = (ActivityRecord)mMainStack.mHistory.get(i); if (r.packageName.equals(name) - && (r.app == null || !r.app.persistent)) { + && (r.app == null || evenPersistent || !r.app.persistent)) { if (!doit) { return true; } @@ -3344,7 +3346,7 @@ public final class ActivityManagerService extends ActivityManagerNative ArrayList services = new ArrayList(); for (ServiceRecord service : mServices.values()) { if (service.packageName.equals(name) - && (service.app == null || !service.app.persistent)) { + && (service.app == null || evenPersistent || !service.app.persistent)) { if (!doit) { return true; } @@ -3757,7 +3759,7 @@ public final class ActivityManagerService extends ActivityManagerNative if (pkgs != null) { for (String pkg : pkgs) { synchronized (ActivityManagerService.this) { - if (forceStopPackageLocked(pkg, -1, false, false, false)) { + if (forceStopPackageLocked(pkg, -1, false, false, false, false)) { setResultCode(Activity.RESULT_OK); return; } @@ -6178,7 +6180,7 @@ public final class ActivityManagerService extends ActivityManagerNative mDebugTransient = !persistent; if (packageName != null) { final long origId = Binder.clearCallingIdentity(); - forceStopPackageLocked(packageName, -1, false, false, true); + forceStopPackageLocked(packageName, -1, false, false, true, true); Binder.restoreCallingIdentity(origId); } } @@ -11256,7 +11258,7 @@ public final class ActivityManagerService extends ActivityManagerNative String list[] = intent.getStringArrayExtra(Intent.EXTRA_CHANGED_PACKAGE_LIST); if (list != null && (list.length > 0)) { for (String pkg : list) { - forceStopPackageLocked(pkg, -1, false, true, true); + forceStopPackageLocked(pkg, -1, false, true, true, false); } sendPackageBroadcastLocked( IApplicationThread.EXTERNAL_STORAGE_UNAVAILABLE, list); @@ -11267,7 +11269,7 @@ public final class ActivityManagerService extends ActivityManagerNative if (data != null && (ssp=data.getSchemeSpecificPart()) != null) { if (!intent.getBooleanExtra(Intent.EXTRA_DONT_KILL_APP, false)) { forceStopPackageLocked(ssp, - intent.getIntExtra(Intent.EXTRA_UID, -1), false, true, true); + intent.getIntExtra(Intent.EXTRA_UID, -1), false, true, true, false); } if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { sendPackageBroadcastLocked(IApplicationThread.PACKAGE_REMOVED, @@ -12364,7 +12366,8 @@ public final class ActivityManagerService extends ActivityManagerNative } final long origId = Binder.clearCallingIdentity(); - forceStopPackageLocked(ii.targetPackage, -1, true, false, true); + // Instrumentation can kill and relaunch even persistent processes + forceStopPackageLocked(ii.targetPackage, -1, true, false, true, true); ProcessRecord app = addAppLocked(ai); app.instrumentationClass = className; app.instrumentationInfo = ai; @@ -12419,7 +12422,7 @@ public final class ActivityManagerService extends ActivityManagerNative app.instrumentationProfileFile = null; app.instrumentationArguments = null; - forceStopPackageLocked(app.processName, -1, false, false, true); + forceStopPackageLocked(app.processName, -1, false, false, true, true); } public void finishInstrumentation(IApplicationThread target,