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

Commit 3e93b59c authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Set canTurnScreenOn to false for any window with flag." into pi-dev 

am: f3fc9a62

Change-Id: Ie8dcb90e15f9ce6b9fbb56e68a57a410f7829d7d
parents 6e4ff09c f3fc9a62

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

+7 −6
Original line number Diff line number Diff line
@@ -2284,13 +2284,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // interactive, the value may persist until the next animation, which could potentially

        // be occurring while turning off the screen. This would lead to the screen incorrectly

        // turning back on.

        if (hasTurnScreenOnFlag && allowTheaterMode && canTurnScreenOn

                && !mPowerManagerWrapper.isInteractive()) {

        if (hasTurnScreenOnFlag) {

            if (allowTheaterMode && canTurnScreenOn && !mPowerManagerWrapper.isInteractive()) {

                if (DEBUG_VISIBILITY || DEBUG_POWER) {

                    Slog.v(TAG, "Relayout window turning screen on: " + this);

                }

                mPowerManagerWrapper.wakeUp(SystemClock.uptimeMillis(),

                        "android.server.wm:TURN_ON");

            }



            if (mAppToken != null) {

                mAppToken.setCanTurnScreenOn(false);