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

Commit 792ae337 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

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

* commit '33a68a52':
  Prevent windows from freezing screen while timeout
parents ada3e013 33a68a52

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -4701,7 +4701,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                WindowState w = wtoken.allAppWindows.get(i);

                WindowState w = wtoken.allAppWindows.get(i);

                if (w.mAppFreezing) {

                if (w.mAppFreezing) {

                    w.mAppFreezing = false;

                    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);

                        if (DEBUG_ORIENTATION) Slog.v(TAG, "set mOrientationChanging of " + w);

                        w.mOrientationChanging = true;

                        w.mOrientationChanging = true;

                        mInnerFields.mOrientationChangeComplete = false;

                        mInnerFields.mOrientationChangeComplete = false;
@@ -9021,7 +9022,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        // If the screen is currently frozen or off, then keep

        // If the screen is currently frozen or off, then keep

        // it frozen/off until this window draws at its new

        // it frozen/off until this window draws at its new

        // orientation.

        // orientation.

        if (!okToDisplay()) {

        if (!okToDisplay() && mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {

            if (DEBUG_ORIENTATION) Slog.v(TAG, "Changing surface while display frozen: " + w);

            if (DEBUG_ORIENTATION) Slog.v(TAG, "Changing surface while display frozen: " + w);

            w.mOrientationChanging = true;

            w.mOrientationChanging = true;

            w.mLastFreezeDuration = 0;

            w.mLastFreezeDuration = 0;