commit 3ae447e8bb0bb5375e696e33331ef959db7e89ad
author Bryce Lee <brycelee@google.com> Tue Jun 30 12:31:41 2015 -0700
committer Bryce Lee <brycelee@google.com> Tue Jun 30 12:31:41 2015 -0700
tree f5aa2baaa4422316008e22d2c3d2c9f0ab283326
parent 4a23ac45895ec65e2357b2e52726229dbead9bb1
parent d903e580aae98315e3f8db7f8fb19c7a85fce96b

Merge commit '91d2cbf4' into manualmerge

Change-Id: Id018e65bdbd67f040af13a07207cac33a4a2a158

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 b77a2534..764e4d3 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -1039,6 +1039,11 @@
             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(),