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

Commit 8a009f43 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents b59b5a67 049b6d89

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.