Merge "Fix back gesture routed to wrong display" into main (431c931d) · Commits · e / os / android_frameworks_base

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

+3 −1

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

		final boolean isInputTargetNotFocused =
		mFocusedInputTarget != t && mFocusedInputTarget != null;
		if (!isInputTargetNotFocused) {
		final boolean isTouchOnFocusedDisplay = mFocusedInputTarget != null
		&& t.getDisplayId() == mFocusedInputTarget.getDisplayId();
		if (!(isInputTargetNotFocused && isTouchOnFocusedDisplay)) {
		return false;
		}