commit 1bc8898ed5c792331a45b3f266025f1d2b437f8e
author Chavi Weingarten <chaviw@google.com> Mon Jul 01 11:56:06 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 01 11:56:06 2019 -0700
tree fb22ddfc095d4e88b4748d3a7b1d89f89510082d
parent 4ef09fd4707dfb548d6aa0736e61c2dcb668ae8d
parent 7efce5e1432513aa71f46ba0a8879b344b5f25d0

Merge "Call syncInputWindows after calling transferTouchFocus" into qt-dev
am: 7efce5e143

Change-Id: I7ee6a48446eea34956f33e330636a5e7884a484e

services/core/java/com/android/server/wm/DragState.java

diff --git a/services/core/java/com/android/server/wm/DragState.java b/services/core/java/com/android/server/wm/DragState.java
index 6127303..553b0ff 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 @@
         mTransaction.transferTouchFocus(mTransferTouchFromToken, h.token);
         mTransferTouchFromToken = null;
 
+        // syncInputWindows here to ensure the input channel isn't removed before the transfer.
+        mTransaction.syncInputWindows();
         mTransaction.apply();
     }