Merge "Add ActivityStack to PendingActivityLaunch" (d8b070cc) · Commits · e / os / android_frameworks_base

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -290,9 +290,18 @@ public final class ActivityManagerService extends ActivityManagerNative
		* due to app switches being disabled.
		*/
		static class PendingActivityLaunch {
		ActivityRecord r;
		ActivityRecord sourceRecord;
		int startFlags;
		final ActivityRecord r;
		final ActivityRecord sourceRecord;
		final int startFlags;
		final ActivityStack stack;

		public PendingActivityLaunch(ActivityRecord _r, ActivityRecord _sourceRecord,
		int _startFlags, ActivityStack _stack) {
		r = _r;
		sourceRecord = _sourceRecord;
		startFlags = _startFlags;
		stack = _stack;
		}
		}

		final ArrayList<PendingActivityLaunch> mPendingActivityLaunches
		@@ -2505,8 +2514,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		for (int i=0; i<N; i++) {
		PendingActivityLaunch pal = mPendingActivityLaunches.get(i);
		pal.r.task.stack.startActivityUncheckedLocked(pal.r, pal.sourceRecord,
		pal.startFlags, doResume && i == (N-1), null);
		pal.stack.startActivityUncheckedLocked(pal.r, pal.sourceRecord, pal.startFlags,
		doResume && i == (N-1), null);
		}
		mPendingActivityLaunches.clear();
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -2585,10 +2585,8 @@ final class ActivityStack {
		if (mResumedActivity == null
		\|\| mResumedActivity.info.applicationInfo.uid != callingUid) {
		if (!mService.checkAppSwitchAllowedLocked(callingPid, callingUid, "Activity start")) {
		PendingActivityLaunch pal = new PendingActivityLaunch();
		pal.r = r;
		pal.sourceRecord = sourceRecord;
		pal.startFlags = startFlags;
		PendingActivityLaunch pal =
		new PendingActivityLaunch(r, sourceRecord, startFlags, this);
		mService.mPendingActivityLaunches.add(pal);
		mDismissKeyguardOnNextActivity = false;
		ActivityOptions.abort(options);