summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2019-07-01 12:25:09 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-01 12:25:09 -0700
commitfbc5939e7898ff7a71253670f3c36f3eda29d0f9 (patch)
tree04d47cb19aeb9a591b816e84c4a16c920a0d1b35
parentd821fb6c0af1c8f89f55be0398537f70da3dc3bb (diff)
parent2aa34e0c30a24b2585376feb7dde64139808bb56 (diff)
Merge "Call syncInputWindows after calling transferTouchFocus" into qt-dev am: 7efce5e143 am: 1bc8898ed5
am: 2aa34e0c30 Change-Id: I0750d7884b5ff6462919b2b26f4094c3d92aee2d
-rw-r--r--services/core/java/com/android/server/wm/DragState.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index 6127303141f4..553b0ffa6999 100644
--- a/services/core/java/com/android/server/wm/DragState.java
+++ b/services/core/java/com/android/server/wm/DragState.java
@@ -176,6 +176,8 @@ class DragState {
mTransaction.transferTouchFocus(mTransferTouchFromToken, h.token);
mTransferTouchFromToken = null;
+ // syncInputWindows here to ensure the input channel isn't removed before the transfer.
+ mTransaction.syncInputWindows();
mTransaction.apply();
}