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

Commit ba1903e5 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

Merge "Do not process set WindowAnimator param when screen is already on." into oc-mr1-dev am: 7a558a91
am: 10d73e41

Change-Id: I3a4d8b1c4b29d06d01332cff50d13b82c8c0206b
parents ca48ea02 10d73e41

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

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

            }