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

am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev

Browse Source 
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
  Turn off theater mode upon power button press.
This commit is contained in:
Bryce Lee
2015-06-23 23:04:26 +00:00
committed by Android Git Automerger
parent 64a4858b32 65dca454c7
commit 91d2cbf447
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -5176,10 +5176,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) { private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {
if (!wakeInTheaterMode && isTheaterModeEnabled()) { final boolean theaterModeEnabled = isTheaterModeEnabled();
if (!wakeInTheaterMode && theaterModeEnabled) {
return false; return false;
} }
if (theaterModeEnabled) {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.THEATER_MODE_ON, 0);
}
mPowerManager.wakeUp(wakeTime); mPowerManager.wakeUp(wakeTime);
return true; return true;
} }