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

Commit 4861f320 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Do not process set WindowAnimator param when screen is already...

Merge "Merge "Do not process set WindowAnimator param when screen is already on." into oc-mr1-dev am: 7a558a91 am: 10d73e41"
parents d13ce18c ba1903e5
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -1652,9 +1652,16 @@ class WindowStateAnimator {
                    if (mWin.mAppToken != null) {
                        mWin.mAppToken.setCanTurnScreenOn(false);
                    }

                    // We do not add {@code SET_TURN_ON_SCREEN} when the screen is already
                    // interactive as the value may persist until the next animation, which could
                    // potentially occurring while turning off the screen. This would lead to the
                    // screen incorrectly turning back on.
                    if (!mService.mPowerManager.isInteractive()) {
                        mAnimator.mBulkUpdateParams |= SET_TURN_ON_SCREEN;
                    }
                }
            }
            if (hasSurface()) {
                w.mToken.hasVisible = true;
            }