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

Commit 6d112722 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am cd616247: am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes 

Merge commit 'cd616247' into kraken

* commit 'cd616247':
  Framework change for #2583442: Navigation dies when night mode changes
parents b7d9e8e1 cd616247

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

+27 −17
Original line number Original line Diff line number Diff line
@@ -148,6 +148,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    static final boolean DEBUG_STARTING_WINDOW = false;

    static final boolean DEBUG_STARTING_WINDOW = false;

    static final boolean DEBUG_REORDER = false;

    static final boolean DEBUG_REORDER = false;

    static final boolean DEBUG_WALLPAPER = false;

    static final boolean DEBUG_WALLPAPER = false;

    static final boolean DEBUG_FREEZE = false;

    static final boolean SHOW_TRANSACTIONS = false;

    static final boolean SHOW_TRANSACTIONS = false;

    static final boolean HIDE_STACK_CRAWLS = true;

    static final boolean HIDE_STACK_CRAWLS = true;

    static final boolean MEASURE_LATENCY = false;

    static final boolean MEASURE_LATENCY = false;
@@ -10696,6 +10697,10 @@ public class WindowManagerService extends IWindowManager.Stub 
        } else if (animating) {

        } else if (animating) {

            requestAnimationLocked(currentTime+(1000/60)-SystemClock.uptimeMillis());

            requestAnimationLocked(currentTime+(1000/60)-SystemClock.uptimeMillis());

        }

        }

        

        if (DEBUG_FREEZE) Slog.v(TAG, "Layout: mDisplayFrozen=" + mDisplayFrozen

                + " holdScreen=" + holdScreen);

        if (!mDisplayFrozen) {

            mQueue.setHoldScreenLocked(holdScreen != null);

            mQueue.setHoldScreenLocked(holdScreen != null);

            if (screenBrightness < 0 || screenBrightness > 1.0f) {

            if (screenBrightness < 0 || screenBrightness > 1.0f) {

                mPowerManager.setScreenBrightnessOverride(-1);

                mPowerManager.setScreenBrightnessOverride(-1);
@@ -10714,6 +10719,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                Message m = mH.obtainMessage(H.HOLD_SCREEN_CHANGED, holdScreen);

                Message m = mH.obtainMessage(H.HOLD_SCREEN_CHANGED, holdScreen);

                mH.sendMessage(m);

                mH.sendMessage(m);

            }

            }

        }





        if (mTurnOnScreen) {

        if (mTurnOnScreen) {

            if (DEBUG_VISIBILITY) Slog.v(TAG, "Turning screen on after layout!");

            if (DEBUG_VISIBILITY) Slog.v(TAG, "Turning screen on after layout!");
@@ -10989,6 +10995,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            mFreezeGcPending = now;

            mFreezeGcPending = now;

        }

        }





        if (DEBUG_FREEZE) Slog.v(TAG, "*** FREEZING DISPLAY", new RuntimeException());

        

        mDisplayFrozen = true;

        mDisplayFrozen = true;

        if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {

        if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {

            mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;

            mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;
@@ -11012,6 +11020,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            return;

            return;

        }

        }

        

        

        if (DEBUG_FREEZE) Slog.v(TAG, "*** UNFREEZING DISPLAY", new RuntimeException());

        

        mDisplayFrozen = false;

        mDisplayFrozen = false;

        mH.removeMessages(H.APP_FREEZE_TIMEOUT);

        mH.removeMessages(H.APP_FREEZE_TIMEOUT);

        if (PROFILE_ORIENTATION) {

        if (PROFILE_ORIENTATION) {