commit 5845eafaad804ffe8088cd34cdb52f6f9f9282de
author Arthur Hung <arthurhung@google.com> Thu Sep 05 16:38:18 2019 +0800
committer Arthur Hung <arthurhung@google.com> Mon Dec 09 09:35:18 2019 +0000
tree e2b5f619774b5266d472e3aa42aa880eb8308a99
parent 5b8a4109f5195e3ca626ab1e6ce9bfd2d1c3f2a8

Revert "Fix drag and drop (2/3)"

This reverts commit fbe5d9c4233dcd802a122f70ca5a3641fcd556ca.

Bug: 137819199
Test: manual
Change-Id: I7afec569519b9c69eb03225672db6db141b20241
Merged-In: I7afec569519b9c69eb03225672db6db141b20241
(cherry picked from commit 6cbb97591535868d629a562dfd7d8e24865cf551)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9efa63c..32748cf 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3026,7 +3026,7 @@
         setInputWindowsFinished();
     }
 
-    executeInputWindowCommands();
+    mInputWindowCommands.clear();
 }
 
 void SurfaceFlinger::updateInputWindowInfo() {
@@ -3050,19 +3050,6 @@
     mPendingInputWindowCommands.clear();
 }
 
-void SurfaceFlinger::executeInputWindowCommands() {
-    for (const auto& transferTouchFocusCommand : mInputWindowCommands.transferTouchFocusCommands) {
-        if (transferTouchFocusCommand.fromToken != nullptr &&
-            transferTouchFocusCommand.toToken != nullptr &&
-            transferTouchFocusCommand.fromToken != transferTouchFocusCommand.toToken) {
-            mInputFlinger->transferTouchFocus(transferTouchFocusCommand.fromToken,
-                                              transferTouchFocusCommand.toToken);
-        }
-    }
-
-    mInputWindowCommands.clear();
-}
-
 void SurfaceFlinger::updateCursorAsync()
 {
     for (const auto& [token, display] : mDisplays) {