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

Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev

Browse Source
This commit is contained in:
Bryce Lee
2015-06-24 00:07:53 +00:00
committed by Android (Google) Code Review
parent d1e62d9dfd d389684bea
commit aef3698f9a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5381,10 +5381,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;
} }