Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 31b37509: am 5cd293b3: Merge "Merge commit \'91d2cbf4\' into manualmerge" into mnc-dev

Browse Source 
* commit '31b375095530c7414305568f3e9ceecfb66ba5bf':
  Only enable theater mode by button press after setup.
This commit is contained in:
Bryce Lee
2015-06-30 21:22:33 +00:00
committed by Android Git Automerger
parent 004eb5c1be 31b3750955
commit cd1fc00800
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1039,6 +1039,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case MULTI_PRESS_POWER_NOTHING: case MULTI_PRESS_POWER_NOTHING:
break; break;
case MULTI_PRESS_POWER_THEATER_MODE: case MULTI_PRESS_POWER_THEATER_MODE:
if (!isUserSetupComplete()) {
Slog.i(TAG, "Ignoring toggling theater mode - device not setup.");
break;
}
if (isTheaterModeEnabled()) { if (isTheaterModeEnabled()) {
Slog.i(TAG, "Toggling theater mode off."); Slog.i(TAG, "Toggling theater mode off.");
Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.putInt(mContext.getContentResolver(),