am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev
* commit '65dca454c7a717b001b51d0089e7565ba428ce87':
Turn off theater mode upon power button press.
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 2fb33b4..ed465de07 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5176,10 +5176,16 @@
}
private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {
- if (!wakeInTheaterMode && isTheaterModeEnabled()) {
+ final boolean theaterModeEnabled = isTheaterModeEnabled();
+ if (!wakeInTheaterMode && theaterModeEnabled) {
return false;
}
+ if (theaterModeEnabled) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.THEATER_MODE_ON, 0);
+ }
+
mPowerManager.wakeUp(wakeTime);
return true;
}