summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Siarhei Vishniakou <svv@google.com> 2019-07-31 12:41:01 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-31 12:41:01 -0700
commit01b699110fe7493b9db00c430bfdead4e29cf1be (patch)
treed8e50f48c7ebc9de442257d10d3e66259bcf30b1
parentf3e49bbf3a0ea47be5a2d972307fbc613f4bbaa4 (diff)
parentb2c6d02647fdf004c8a6ead12c509e804b4820b5 (diff)
Merge "syncInputWindows for mouse events" into qt-dev am: 2774eb6635
am: b2c6d02647 Change-Id: I67edfd43cbec7e0014ba64b2df596837def4559b
-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 f356b51ebb7b..c14af3987438 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7688,10 +7688,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 =