Merge "Only enable theater mode by button press after setup." into cw-d-mr1-dev

2015-06-30 17:13:02 +00:00
parent b6c158f9d8 cb8f188191
commit cc2ba2200d
1 changed files with 5 additions and 0 deletions
--- 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(),