Merge "Fix unable to resume show-when-lock activity" (e672d073) · Commits · e / os / android_frameworks_base

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

+18 −7

Original line number	Diff line number	Diff line
		@@ -2450,6 +2450,16 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		if (shouldSleepOrShutDownActivities()
		&& mLastPausedActivity == next
		&& mStackSupervisor.allPausedActivitiesComplete()) {
		// If the current top activity may be able to occlude keyguard but the occluded state
		// has not been set, update visibility and check again if we should continue to resume.
		boolean nothingToResume = true;
		if (!mService.mShuttingDown && !mTopActivityOccludesKeyguard
		&& next.canShowWhenLocked()) {
		ensureActivitiesVisibleLocked(null /* starting /, 0 / configChanges */,
		!PRESERVE_WINDOWS);
		nothingToResume = shouldSleepActivities();
		}
		if (nothingToResume) {
		// Make sure we have executed any pending transitions, since there
		// should be nothing left to do at this point.
		executeAppTransition(options);
		@@ -2458,6 +2468,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();
		return false;
		}
		}

		// Make sure that the user who owns this activity is started. If not,
		// we will just leave it as is because someone should be bringing