Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-09-09 01:20:31 +00:00
committed by Android (Google) Code Review
parent d13ce18cfc ba1903e580
commit 4861f3202d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/WindowStateAnimator.java
View File

@@ -1652,7 +1652,14 @@ class WindowStateAnimator {
if (mWin.mAppToken != null) {
mWin.mAppToken.setCanTurnScreenOn(false);
}
mAnimator.mBulkUpdateParams |= SET_TURN_ON_SCREEN;
// 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()) {