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

Commit 87ac10db authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge \"Fixed bug with continuously changing orientation while dreaming\" into nyc-mr1-dev 

am: 8a009f43

Change-Id: I968eafcd1066d711e23e29506a841d8d61eb6404
parents 2efd0acb 8a009f43

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

+7 −0
Original line number Diff line number Diff line
@@ -3519,6 +3519,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                // can re-appear and inflict its own orientation on us.  Keep the

                // orientation stable until this all settles down.

                return mLastWindowForcedOrientation;

            } else if (mPolicy.isKeyguardLocked()

                    && mLastKeyguardForcedOrientation != SCREEN_ORIENTATION_UNSPECIFIED) {

                // Use the last orientation the keyguard forced while the display is frozen with the

                // keyguard locked.

                if (DEBUG_ORIENTATION) Slog.v(TAG_WM, "Display is frozen while keyguard locked, "

                        + "return " + mLastKeyguardForcedOrientation);

                return mLastKeyguardForcedOrientation;

            }

        } else {

            // TODO(multidisplay): Change to the correct display.