Merge "Make activities invisible when the display is turned off." into qt-dev (832c8a2c) · Commits · e / os / android_frameworks_base

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

+9 −2

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ import static android.content.res.Configuration.UI_MODE_TYPE_VR_HEADSET;
		import static android.os.Build.VERSION_CODES.HONEYCOMB;
		import static android.os.Build.VERSION_CODES.O;
		import static android.os.Process.SYSTEM_UID;
		import static android.view.Display.DEFAULT_DISPLAY;
		import static android.view.Display.INVALID_DISPLAY;
		import static android.view.Surface.ROTATION_270;
		import static android.view.Surface.ROTATION_90;
		@@ -1948,14 +1949,20 @@ final class ActivityRecord extends ConfigurationContainer {
		return false;
		}

		// Whether the activity is on the sleeping display.
		// TODO(b/129750406): This should be applied for the default display, too.
		final boolean isDisplaySleeping = getDisplay().isSleeping()
		&& getDisplayId() != DEFAULT_DISPLAY;
		// Whether this activity is the top activity of this stack.
		final boolean isTop = this == stack.getTopActivity();
		// Exclude the case where this is the top activity in a pinned stack.
		final boolean isTopNotPinnedStack = stack.isAttached()
		&& stack.getDisplay().isTopNotPinnedStack(stack);
		// Now check whether it's really visible depending on Keyguard state.
		return stack.checkKeyguardVisibility(this,
		// Now check whether it's really visible depending on Keyguard state, and update
		// {@link ActivityStack} internal states.
		final boolean visibleIgnoringDisplayStatus = stack.checkKeyguardVisibility(this,
		visibleIgnoringKeyguard, isTop && isTopNotPinnedStack);
		return visibleIgnoringDisplayStatus && !isDisplaySleeping;
		}

		boolean shouldBeVisible() {

services/core/java/com/android/server/wm/KeyguardController.java

+23 −14

Original line number	Diff line number	Diff line
		@@ -294,7 +294,16 @@ class KeyguardController {
		/**
		* Called when occluded state changed.
		*/
		private void handleOccludedChanged() {
		private void handleOccludedChanged(int displayId) {
		// TODO(b/113840485): Handle app transition for individual display, and apply occluded
		// state change to secondary displays.
		// For now, only default display fully supports occluded change. Other displays only
		// updates keygaurd sleep token on that display.
		if (displayId != DEFAULT_DISPLAY) {
		updateKeyguardSleepToken(displayId);
		return;
		}

		mWindowManager.onKeyguardOccludedChanged(isDisplayOccluded(DEFAULT_DISPLAY));
		if (isKeyguardLocked()) {
		mWindowManager.deferSurfaceLayout();
		@@ -303,7 +312,7 @@ class KeyguardController {
		.prepareAppTransition(resolveOccludeTransit(),
		false /* alwaysKeepCurrent /, 0 / flags */,
		true /* forceOverride */);
		updateKeyguardSleepToken();
		updateKeyguardSleepToken(DEFAULT_DISPLAY);
		mRootActivityContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);
		mWindowManager.executeAppTransition();
		} finally {
		@@ -395,7 +404,11 @@ class KeyguardController {
		for (int displayNdx = mRootActivityContainer.getChildCount() - 1;
		displayNdx >= 0; displayNdx--) {
		final ActivityDisplay display = mRootActivityContainer.getChildAt(displayNdx);
		final int displayId = display.mDisplayId;
		updateKeyguardSleepToken(display.mDisplayId);
		}
		}

		private void updateKeyguardSleepToken(int displayId) {
		final KeyguardDisplayState state = getDisplay(displayId);
		if (isKeyguardUnoccludedOrAodShowing(displayId) && state.mSleepToken == null) {
		state.acquiredSleepToken();
		@@ -403,7 +416,6 @@ class KeyguardController {
		state.releaseSleepToken();
		}
		}
		}

		private KeyguardDisplayState getDisplay(int displayId) {
		KeyguardDisplayState state = mDisplayStates.get(displayId);
		@@ -483,11 +495,8 @@ class KeyguardController {
		mOccluded \|= controller.mWindowManager.isShowingDream();
		}

		// TODO(b/113840485): Handle app transition for individual display, and apply occluded
		// state change to secondary displays.
		// For now, only default display can change occluded.
		if (lastOccluded != mOccluded && mDisplayId == DEFAULT_DISPLAY) {
		controller.handleOccludedChanged();
		if (lastOccluded != mOccluded) {
		controller.handleOccludedChanged(mDisplayId);
		}
		if (lastDismissActivity != mDismissingKeyguardActivity && !mOccluded
		&& mDismissingKeyguardActivity != null