diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-04-20 18:58:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-20 18:58:53 -0700 |
| commit | 8ff0c9204e565d7389b10495cf885c772d204be5 (patch) | |
| tree | f1aa6de8db6a70fbe95d2198b63c3edacb21ab43 /services/java/com/android/server/wm/WindowManagerService.java | |
| parent | 7dc3d82a392696ede0757980cd68105682c46768 (diff) | |
| parent | 19caadc08f09cc9f6665fbbb0d61e02861ce8562 (diff) | |
| download | frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.zip frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.tar.gz frameworks_base-8ff0c9204e565d7389b10495cf885c772d204be5.tar.bz2 | |
Merge "You can now long press on the power off menu to reboot to safe mode."
Diffstat (limited to 'services/java/com/android/server/wm/WindowManagerService.java')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index f64ad12..ff41899 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -34,6 +34,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import com.android.internal.app.IBatteryStats; +import com.android.internal.app.ShutdownThread; import com.android.internal.policy.PolicyManager; import com.android.internal.policy.impl.PhoneWindowManager; import com.android.internal.view.IInputContext; @@ -6505,6 +6506,13 @@ public class WindowManagerService extends IWindowManager.Stub KeyEvent.KEYCODE_VOLUME_DOWN); mSafeMode = menuState > 0 || sState > 0 || dpadState > 0 || trackballState > 0 || volumeDownState > 0; + try { + if (SystemProperties.getInt(ShutdownThread.REBOOT_SAFEMODE_PROPERTY, 0) != 0) { + mSafeMode = true; + SystemProperties.set(ShutdownThread.REBOOT_SAFEMODE_PROPERTY, ""); + } + } catch (IllegalArgumentException e) { + } if (mSafeMode) { Log.i(TAG, "SAFE MODE ENABLED (menu=" + menuState + " s=" + sState + " dpad=" + dpadState + " trackball=" + trackballState + ")"); |