summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2019-07-01 18:20:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-07-01 18:20:53 +0000
commit7efce5e1432513aa71f46ba0a8879b344b5f25d0 (patch)
treec5ceb4c474560d8a88fcc860d4f26c8c0c58759f
parent5924e5eee9b9f011a830583bba094df810a18d5b (diff)
parentdc5ca62c0d6dffd88d2f8de0aa8f9d27d2de31a3 (diff)
Merge "Call syncInputWindows after calling transferTouchFocus" into qt-dev
-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();
}