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

am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout"

Browse Source 
* commit '343e291b67432427709a20e97f42fbc329c45c44':
  Prevent windows from freezing screen while timeout
This commit is contained in:
Olawale Ogunwale
2015-04-09 00:56:27 +00:00
committed by Android Git Automerger
parent 2d81cb6824 343e291b67
commit 33a68a521f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4735,7 +4735,8 @@ public class WindowManagerService extends IWindowManager.Stub
WindowState w = wtoken.allAppWindows.get(i);
if (w.mAppFreezing) {
w.mAppFreezing = false;
if (w.mHasSurface && !w.mOrientationChanging) {
if (w.mHasSurface && !w.mOrientationChanging
&& mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {
if (DEBUG_ORIENTATION) Slog.v(TAG, "set mOrientationChanging of " + w);
w.mOrientationChanging = true;
mInnerFields.mOrientationChangeComplete = false;
@@ -9103,7 +9104,7 @@ public class WindowManagerService extends IWindowManager.Stub
// If the screen is currently frozen or off, then keep
// it frozen/off until this window draws at its new
// orientation.
if (!okToDisplay()) {
if (!okToDisplay() && mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {
if (DEBUG_ORIENTATION) Slog.v(TAG, "Changing surface while display frozen: " + w);
w.mOrientationChanging = true;
w.mLastFreezeDuration = 0;