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

2018-05-31 18:49:38 +00:00
parent a78334f80c b1a13f8093
commit 89e1217c8f
1 changed files with 4 additions and 1 deletions
--- 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");
        }