commit aef3698f9a80626fc8dc8be5e4d1359cafcc17d2
author Bryce Lee <brycelee@google.com> Wed Jun 24 00:07:53 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 24 00:07:54 2015 +0000
tree a3a80095f7cbc8812eca081558f2cc4ae1aa7725
parent d1e62d9dfd0c995084046188fbde7dac40401162
parent d389684beaf5be3afbb78d11ffd32f07eaabee58

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

services/core/java/com/android/server/policy/PhoneWindowManager.java

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;
     }