Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfee2faa authored Feb 14, 2023 by Josh Tsuji Committed by Android (Google) Code Review Feb 14, 2023

Merge "FIx occlusion status mismatch issue when screen turns off and on quickly"

parents 6b93841d b71c7b40

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3501,8 +3501,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		@Override
		public void onKeyguardOccludedChangedLw(boolean occluded) {
		if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {
		public void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition) {
		if (mKeyguardDelegate != null && waitAppTransition) {
		mPendingKeyguardOccluded = occluded;
		mKeyguardOccludedChanged = true;
		} else {

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -164,9 +164,10 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {

		/**
		* Called when the Keyguard occluded state changed.
		*
		* @param occluded Whether Keyguard is currently occluded or not.
		*/
		void onKeyguardOccludedChangedLw(boolean occluded);
		void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition);

		/**
		* @param notify {@code true} if the status change should be immediately notified via

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -401,8 +401,10 @@ class KeyguardController {
		return;
		}

		mWindowManager.mPolicy.onKeyguardOccludedChangedLw(isDisplayOccluded(DEFAULT_DISPLAY));
		if (isKeyguardLocked(displayId)) {
		final boolean waitAppTransition = isKeyguardLocked(displayId);
		mWindowManager.mPolicy.onKeyguardOccludedChangedLw(isDisplayOccluded(DEFAULT_DISPLAY),
		waitAppTransition);
		if (waitAppTransition) {
		mService.deferWindowLayout();
		try {
		mRootWindowContainer.getDefaultDisplay()

services/tests/wmtests/src/com/android/server/wm/TestWindowManagerPolicy.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -222,7 +222,7 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
		}

		@Override
		public void onKeyguardOccludedChangedLw(boolean occluded) {
		public void onKeyguardOccludedChangedLw(boolean occluded, boolean waitAppTransition) {
		}

		public void setSafeMode(boolean safeMode) {