From 4be12ea1e26e303e1cb0b77a66048c3234c9470f Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Thu, 25 Jul 2019 09:59:17 -0700 Subject: syncInputWindows for mouse events Add back the syncInputWindows calls for mouse events, because there are tests that rely on this behaviour (they might inject only a few events, which is not very realistic, but we still have to support this). Bug: 137072767 Bug: 138263890 Test: atest android.view.cts.HoverTest Change-Id: I37b621bc6dc6a844ca86324962124bb06857b906 --- services/core/java/com/android/server/wm/WindowManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index fb57d73c9a21..436a5c729b86 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -7670,10 +7670,12 @@ public class WindowManagerService extends IWindowManager.Stub isDown = motionEvent.getAction() == MotionEvent.ACTION_DOWN; isUp = motionEvent.getAction() == MotionEvent.ACTION_UP; } + final boolean isMouseEvent = ev.getSource() == InputDevice.SOURCE_MOUSE; // For ACTION_DOWN, syncInputTransactions before injecting input. + // For all mouse events, also sync before injecting. // For ACTION_UP, sync after injecting. - if (isDown) { + if (isDown || isMouseEvent) { syncInputTransactions(); } final boolean result = -- cgit v1.2.3-59-g8ed1b