am 65dca454: Merge "Turn off theater mode upon power button press." into cw-d-mr1-dev (91d2cbf4) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -5176,10 +5176,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

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