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

Commit eb902def authored Feb 15, 2023 by TreeHugger Robot Committed by Android (Google) Code Review Feb 15, 2023

Merge "FIx occlusion status mismatch issue when screen turns off and on quickly" into tm-qpr-dev

parents c519351a b323776b

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3324,8 +3324,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
		@@ -166,9 +166,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);

		/**
		* Applies a keyguard occlusion change if one happened.

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -403,8 +403,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) {