commit 25e2af10b9200f2970985b54db17b6d427928e89
author Arthur Hung <arthurhung@google.com> Thu Mar 26 12:58:37 2020 +0000
committer Arthur Hung <arthurhung@google.com> Thu Mar 26 12:59:06 2020 +0000
tree e67ac5da78f34f4812dee40be5366d7d8d27247b
parent 2d112c5f625d09bb703b8909289d11f02ee44398

Revert "Fix input infos are inconsistent between WMS and InputFlinger (2/2)"

This reverts commit 2d112c5f625d09bb703b8909289d11f02ee44398.

Reason for revert: Inject event may take too long if no animation.

Change-Id: Ie101f881363cf088a73a8b106fd242c15c7788bf

services/inputflinger/dispatcher/include/InputDispatcherInterface.h

diff --git a/services/inputflinger/dispatcher/include/InputDispatcherInterface.h b/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
index 09dc92c..6e98676 100644
--- a/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
+++ b/services/inputflinger/dispatcher/include/InputDispatcherInterface.h
@@ -19,7 +19,6 @@
 
 #include <InputListener.h>
 #include <input/ISetInputWindowsListener.h>
-#include <unordered_map>
 
 namespace android {
 
@@ -100,13 +99,13 @@
      */
     virtual std::unique_ptr<VerifiedInputEvent> verifyInputEvent(const InputEvent& event) = 0;
 
-    /* Sets the list of input windows per display.
+    /* Sets the list of input windows.
      *
      * This method may be called on any thread (usually by the input manager).
      */
     virtual void setInputWindows(
-            const std::unordered_map<int32_t, std::vector<sp<InputWindowHandle>>>&
-                    handlesPerDisplay) = 0;
+            const std::vector<sp<InputWindowHandle> >& inputWindowHandles, int32_t displayId,
+            const sp<ISetInputWindowsListener>& setInputWindowsListener = nullptr) = 0;
 
     /* Sets the focused application on the given display.
      *