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

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

Browse Source 
am: 3e93b59c73

Change-Id: Ic53e0de1a0edc566664ade9d9e72e2c160a76fa0
This commit is contained in:
Chavi Weingarten
2018-03-08 22:26:38 +00:00
committed by android-build-merger
parent 94c986cbb5 3e93b59c73
commit fd39bec200
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -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 (DEBUG_VISIBILITY || DEBUG_POWER) {
Slog.v(TAG, "Relayout window turning screen on: " + this);
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");
}
mPowerManagerWrapper.wakeUp(SystemClock.uptimeMillis(),
"android.server.wm:TURN_ON");
if (mAppToken != null) {
mAppToken.setCanTurnScreenOn(false);