From cb8f1881910c696109fe8c5fa485b808625e4bd5 Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Thu, 25 Jun 2015 10:54:06 -0700 Subject: [PATCH] Only enable theater mode by button press after setup. Bug: 21751167 Change-Id: I7f69ff767aaea97829e8eb6f5f13faace1aae416 --- .../com/android/internal/policy/impl/PhoneWindowManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 37e110997425d..bf7e0713d585c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1005,6 +1005,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { case MULTI_PRESS_POWER_NOTHING: break; case MULTI_PRESS_POWER_THEATER_MODE: + if (!isUserSetupComplete()) { + Slog.i(TAG, "Ignoring toggling theater mode - device not setup."); + break; + } + if (isTheaterModeEnabled()) { Slog.i(TAG, "Toggling theater mode off."); Settings.Global.putInt(mContext.getContentResolver(),