Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b841d0dc authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

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

Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev am: 89e1217c
am: 3dc6c2b6

Change-Id: I8c43da05791e5eda0517c4b97318280e67fec7f2
parents 98b80379 3dc6c2b6

services/core/java/com/android/server/wm/WindowManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -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 + ")");

            // 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");

        }