Merge "resolved conflicts for merge of 91d2cbf4 to mnc-dev" into mnc-dev (aef3698f) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -5381,10 +5381,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;
		}