Merge "Recompute focus in showLw if needed" into oc-dev (c6f5f84b) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -2395,6 +2395,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		if (requestAnim) {
		mService.scheduleAnimationLocked();
		}
		if ((mAttrs.flags & FLAG_NOT_FOCUSABLE) == 0) {
		mService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, false /* updateImWindows */);
		}
		return true;
		}

		@@ -2437,6 +2440,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		if (requestAnim) {
		mService.scheduleAnimationLocked();
		}
		if (mService.mCurrentFocus == this) {
		mService.updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, false /* updateImWindows */);
		}
		return true;
		}