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

Commit 06610fc7 authored by David Stevens's avatar David Stevens Committed by Android (Google) Code Review
Browse files

Merge "Check correct DisplayContent when making window freezing screen" into oc-mr1-dev

parents f15c825d 5a9ecee7

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

+1 −4
Original line number Diff line number Diff line
@@ -5811,10 +5811,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.

        // TODO (multidisplay): Support screen freezing on secondary displays.

        final DisplayContent dc = mRoot.getDisplayContent(DEFAULT_DISPLAY);

        if ((dc == null || !dc.okToDisplay())

                && mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {

        if (!w.mToken.okToDisplay() && mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {

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

            w.setOrientationChanging(true);

            w.mLastFreezeDuration = 0;