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

Browse Source
This commit is contained in:
Chavi Weingarten
2018-03-08 20:35:58 +00:00
committed by Android (Google) Code Review
parent eda2ebd206 474093d699
commit f3fc9a62cd
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 // 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 // be occurring while turning off the screen. This would lead to the screen incorrectly
// turning back on. // turning back on.
if (hasTurnScreenOnFlag && allowTheaterMode && canTurnScreenOn if (hasTurnScreenOnFlag) {
&& !mPowerManagerWrapper.isInteractive()) { if (allowTheaterMode && canTurnScreenOn && !mPowerManagerWrapper.isInteractive()) {
if (DEBUG_VISIBILITY || DEBUG_POWER) { if (DEBUG_VISIBILITY || DEBUG_POWER) {
Slog.v(TAG, "Relayout window turning screen on: " + this); 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) { if (mAppToken != null) {
mAppToken.setCanTurnScreenOn(false); mAppToken.setCanTurnScreenOn(false);