summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-07-31 18:14:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-07-31 18:14:57 +0000
commit2774eb663565cbe8974c37827dc3019f851e1fec (patch)
tree3c67f37e82dc9d2782391e7b56ccb0d64a67b7af
parent8292b6bb4475399de9c3d37c7e8f6d9cf22cd063 (diff)
parent4be12ea1e26e303e1cb0b77a66048c3234c9470f (diff)
Merge "syncInputWindows for mouse events" into qt-dev
-rw-r--r--services/core/java/com/android/server/wm/WindowManagerService.java4
1 files changed, 3 insertions, 1 deletions
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 =