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

Merge "Do not process set WindowAnimator param when screen is already on." into oc-mr1-dev

Browse Source 
am: 7a558a91d4

Change-Id: I759d97cfd2d109e5cff0e15e2101b26660ffc212
This commit is contained in:
Bryce Lee
2017-09-09 00:47:52 +00:00
committed by android-build-merger
parent 7bf620f494 7a558a91d4
commit 10d73e4104
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1657,9 +1657,16 @@ class WindowStateAnimator {
if (mWin.mAppToken != null) { if (mWin.mAppToken != null) {
mWin.mAppToken.setCanTurnScreenOn(false); 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; mAnimator.mBulkUpdateParams |= SET_TURN_ON_SCREEN;
} }
} }
}
if (hasSurface()) { if (hasSurface()) {
w.mToken.hasVisible = true; w.mToken.hasVisible = true;
} }