Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev

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 9c253fb949e1..2885b6fe29de 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -4509,7 +4509,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");
         }