am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes (cd616247) · Commits · e / os / android_frameworks_base

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

+27 −17

Original line number	Diff line number	Diff line
		@@ -148,6 +148,7 @@ public class WindowManagerService extends IWindowManager.Stub
		static final boolean DEBUG_STARTING_WINDOW = false;
		static final boolean DEBUG_REORDER = false;
		static final boolean DEBUG_WALLPAPER = false;
		static final boolean DEBUG_FREEZE = false;
		static final boolean SHOW_TRANSACTIONS = false;
		static final boolean HIDE_STACK_CRAWLS = true;
		static final boolean MEASURE_LATENCY = false;
		@@ -10696,6 +10697,10 @@ public class WindowManagerService extends IWindowManager.Stub
		} else if (animating) {
		requestAnimationLocked(currentTime+(1000/60)-SystemClock.uptimeMillis());
		}

		if (DEBUG_FREEZE) Slog.v(TAG, "Layout: mDisplayFrozen=" + mDisplayFrozen
		+ " holdScreen=" + holdScreen);
		if (!mDisplayFrozen) {
		mQueue.setHoldScreenLocked(holdScreen != null);
		if (screenBrightness < 0 \|\| screenBrightness > 1.0f) {
		mPowerManager.setScreenBrightnessOverride(-1);
		@@ -10714,6 +10719,7 @@ public class WindowManagerService extends IWindowManager.Stub
		Message m = mH.obtainMessage(H.HOLD_SCREEN_CHANGED, holdScreen);
		mH.sendMessage(m);
		}
		}

		if (mTurnOnScreen) {
		if (DEBUG_VISIBILITY) Slog.v(TAG, "Turning screen on after layout!");
		@@ -10989,6 +10995,8 @@ public class WindowManagerService extends IWindowManager.Stub
		mFreezeGcPending = now;
		}

		if (DEBUG_FREEZE) Slog.v(TAG, "*** FREEZING DISPLAY", new RuntimeException());

		mDisplayFrozen = true;
		if (mNextAppTransition != WindowManagerPolicy.TRANSIT_UNSET) {
		mNextAppTransition = WindowManagerPolicy.TRANSIT_UNSET;
		@@ -11012,6 +11020,8 @@ public class WindowManagerService extends IWindowManager.Stub
		return;
		}

		if (DEBUG_FREEZE) Slog.v(TAG, "*** UNFREEZING DISPLAY", new RuntimeException());

		mDisplayFrozen = false;
		mH.removeMessages(H.APP_FREEZE_TIMEOUT);
		if (PROFILE_ORIENTATION) {