Merge "Fix system circular wait during top display focus change" (22b4fc7c) · Commits · e / os / android_frameworks_base

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

+16 −14

Original line number	Diff line number	Diff line
		@@ -4402,6 +4402,7 @@ public class WindowManagerService extends IWindowManager.Stub

		lastFocus = displayContent.mLastFocus;
		newFocus = displayContent.mCurrentFocus;
		}
		if (lastFocus == newFocus) {
		// Report focus to ViewRootImpl when top focused display changes.
		// Or, nothing to do for no window focus change.
		@@ -4418,6 +4419,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		return;
		}
		synchronized (mGlobalLock) {
		displayContent.mLastFocus = newFocus;
		if (DEBUG_FOCUS_LIGHT) Slog.i(TAG_WM, "Focus moving from " + lastFocus +
		" to " + newFocus + " displayId=" + displayContent.getDisplayId());