Merge "Prevent windows from freezing screen while timeout" (e8a3c320) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -4717,7 +4717,8 @@ public class WindowManagerService extends IWindowManager.Stub
		WindowState w = wtoken.allAppWindows.get(i);
		if (w.mAppFreezing) {
		w.mAppFreezing = false;
		if (w.mHasSurface && !w.mOrientationChanging) {
		if (w.mHasSurface && !w.mOrientationChanging
		&& mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {
		if (DEBUG_ORIENTATION) Slog.v(TAG, "set mOrientationChanging of " + w);
		w.mOrientationChanging = true;
		mInnerFields.mOrientationChangeComplete = false;
		@@ -9083,7 +9084,7 @@ public class WindowManagerService extends IWindowManager.Stub
		// If the screen is currently frozen or off, then keep
		// it frozen/off until this window draws at its new
		// orientation.
		if (!okToDisplay()) {
		if (!okToDisplay() && mWindowsFreezingScreen != WINDOWS_FREEZING_SCREENS_TIMEOUT) {
		if (DEBUG_ORIENTATION) Slog.v(TAG, "Changing surface while display frozen: " + w);
		w.mOrientationChanging = true;
		w.mLastFreezeDuration = 0;