Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-27 17:24:20 +00:00
committed by Android (Google) Code Review
parent b59b5a679a 049b6d8927
commit 8a009f43bf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -3519,6 +3519,13 @@ public class WindowManagerService extends IWindowManager.Stub
// can re-appear and inflict its own orientation on us. Keep the // can re-appear and inflict its own orientation on us. Keep the
// orientation stable until this all settles down. // orientation stable until this all settles down.
return mLastWindowForcedOrientation; 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 { } else {
// TODO(multidisplay): Change to the correct display. // TODO(multidisplay): Change to the correct display.