commit | d389684beaf5be3afbb78d11ffd32f07eaabee58 | [log] [tgz] |
---|---|---|
author | Bryce Lee <brycelee@google.com> | Tue Jun 23 17:06:51 2015 -0700 |
committer | Bryce Lee <brycelee@google.com> | Tue Jun 23 17:06:51 2015 -0700 |
tree | e5218bfaeede11e8cfeabc1bc17a73ff1fdfd48b | |
parent | b1825feac000e8d7999b0b956f104e989ea34d05 [diff] | |
parent | 91d2cbf44748ab40b8e4c52f28b7b5343d93e20e [diff] |
resolved conflicts for merge of 91d2cbf4 to mnc-dev Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 79dac14..93e1f18 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5381,10 +5381,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; }