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

Commit 8b1f60a9 authored Sep 29, 2016 by liulvping Committed by android-build-merger Sep 29, 2016

Merge "Clear pending activity launches when force stop package" am: 00b678dd

am: 5b65b132

Change-Id: Ie5287b8e3c27ae48c513fed6111cab8914cac4dc

parents 5545f020 5b65b132

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6131,6 +6131,8 @@ public final class ActivityManagerService extends ActivityManagerNative
	ProcessList.INVALID_ADJ, callerWillRestart, true, doit, evenPersistent,		ProcessList.INVALID_ADJ, callerWillRestart, true, doit, evenPersistent,
	packageName == null ? ("stop user " + userId) : ("stop " + packageName));		packageName == null ? ("stop user " + userId) : ("stop " + packageName));

			didSomething \|= mActivityStarter.clearPendingActivityLaunchesLocked(packageName);

	if (mStackSupervisor.finishDisabledPackageActivitiesLocked(		if (mStackSupervisor.finishDisabledPackageActivitiesLocked(
	packageName, null, doit, evenPersistent, userId)) {		packageName, null, doit, evenPersistent, userId)) {
	if (!doit) {		if (!doit) {

services/core/java/com/android/server/am/ActivityStarter.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2011,4 +2011,18 @@ class ActivityStarter {
	}		}
	}		}
	}		}

			boolean clearPendingActivityLaunchesLocked(String packageName) {
			boolean didSomething = false;

			for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) {
			PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx);
			ActivityRecord r = pal.r;
			if (r != null && r.packageName.equals(packageName)) {
			mPendingActivityLaunches.remove(palNdx);
			didSomething = true;
			}
			}
			return didSomething;
			}
	}		}