Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev (89e1217c) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 + ")");
		// 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");
		}