am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on... (7544c829) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2870,7 +2870,6 @@ final class ActivityStack {
		// down to the max limit while they are still waiting to finish.
		mStackSupervisor.mFinishingActivities.remove(r);
		mStackSupervisor.mWaitingVisibleActivities.remove(r);
		mStackSupervisor.removePendingActivityLaunchesLocked(r);

		// Remove any pending results.
		if (r.finishing && r.pendingResults != null) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -2037,10 +2037,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		}

		void removePendingActivityLaunchesLocked(ActivityRecord r) {
		void removePendingActivityLaunchesLocked(ActivityStack stack) {
		for (int palNdx = mPendingActivityLaunches.size() - 1; palNdx >= 0; --palNdx) {
		PendingActivityLaunch pal = mPendingActivityLaunches.get(palNdx);
		if (pal.r == r) {
		if (pal.stack == stack) {
		mPendingActivityLaunches.remove(palNdx);
		}
		}
		@@ -3458,6 +3458,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		long origId = Binder.clearCallingIdentity();
		try {
		mStack.finishAllActivitiesLocked(false);
		removePendingActivityLaunchesLocked(mStack);
		} finally {
		Binder.restoreCallingIdentity(origId);
		}