summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index a2ffcae9a6b3..9c94311b35c4 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -4498,7 +4498,10 @@ public class WindowManagerService extends IWindowManager.Stub
if (mSafeMode) {
Log.i(TAG_WM, "SAFE MODE ENABLED (menu=" + menuState + " s=" + sState
+ " dpad=" + dpadState + " trackball=" + trackballState + ")");
- SystemProperties.set(ShutdownThread.RO_SAFEMODE_PROPERTY, "1");
+ // May already be set if (for instance) this process has crashed
+ if (SystemProperties.getInt(ShutdownThread.RO_SAFEMODE_PROPERTY, 0) == 0) {
+ SystemProperties.set(ShutdownThread.RO_SAFEMODE_PROPERTY, "1");
+ }
} else {
Log.i(TAG_WM, "SAFE MODE not enabled");
}