Merge "Use isKeyguardLocked to determine whether to resume." into pi-dev am: 5796ab29e6 (170b4971) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -1750,8 +1750,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		// this when there is an activity waiting to become translucent as the extra binder
		// calls will lead to noticeable jank. A later call to
		// ActivityStack#ensureActivitiesVisibleLocked will bring the activity to the proper
		// paused state.
		if (isState(STOPPED, STOPPING) && stack.mTranslucentActivityWaiting == null) {
		// paused state. We also avoid doing this for the activity the stack supervisor
		// considers the resumed activity, as normal means will bring the activity from STOPPED
		// to RESUMED. Adding PAUSING in this scenario will lead to double lifecycles.
		if (isState(STOPPED, STOPPING) && stack.mTranslucentActivityWaiting == null
		&& mStackSupervisor.getResumedActivityLocked() != this) {
		// Capture reason before state change
		final String reason = getLifecycleDescription("makeVisibleIfNeeded");

+5 −5

Original line number	Diff line number	Diff line
		@@ -3375,11 +3375,11 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		stack.goToSleepIfPossible(false /* shuttingDown */);
		} else {
		stack.awakeFromSleepingLocked();
		if (isFocusedStack(stack)
		&& !mKeyguardController.isKeyguardActive(display.mDisplayId)) {
		// If there is no keyguard on this display - resume immediately. Otherwise
		// we'll wait for keyguard visibility callback and resume while ensuring
		// activities visibility
		if (isFocusedStack(stack) && !mKeyguardController.isKeyguardLocked()) {
		// If the keyguard is unlocked - resume immediately.
		// It is possible that the display will not be awake at the time we
		// process the keyguard going away, which can happen before the sleep token
		// is released. As a result, it is important we resume the activity here.
		resumeFocusedStackTopActivityLocked();
		}
		}

+2 −10

Original line number	Diff line number	Diff line
		@@ -86,16 +86,8 @@ class KeyguardController {
		* display, false otherwise
		*/
		boolean isKeyguardShowing(int displayId) {
		return isKeyguardActive(displayId) && !mKeyguardGoingAway;
		}

		/**
		* @return true if Keyguard is showing and not occluded. We ignore whether it is going away or
		* not here.
		*/
		boolean isKeyguardActive(int displayId) {
		return mKeyguardShowing && (displayId == DEFAULT_DISPLAY ? !mOccluded
		: displayId == mSecondaryDisplayShowing);
		return mKeyguardShowing && !mKeyguardGoingAway &&
		(displayId == DEFAULT_DISPLAY ? !mOccluded : displayId == mSecondaryDisplayShowing);
		}

		/**

+9 −1

Original line number	Diff line number	Diff line
		@@ -123,12 +123,20 @@ public class ActivityRecordTests extends ActivityTestsBase {
		}
		return null;
		}).when(mActivity.app.thread).scheduleTransaction(any());

		mActivity.setState(STOPPED, "testPausingWhenVisibleFromStopped");

		// The activity is in the focused stack so it should not move to paused.
		mActivity.makeVisibleIfNeeded(null /* starting */);
		assertTrue(mActivity.isState(STOPPED));
		assertFalse(pauseFound.value);

		assertTrue(mActivity.isState(PAUSING));
		// Clear focused stack
		mActivity.mStackSupervisor.mFocusedStack = null;

		// In the unfocused stack, the activity should move to paused.
		mActivity.makeVisibleIfNeeded(null /* starting */);
		assertTrue(mActivity.isState(PAUSING));
		assertTrue(pauseFound.value);

		// Make sure that the state does not change for current non-stopping states.