From 25e2af10b9200f2970985b54db17b6d427928e89 Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Thu, 26 Mar 2020 12:58:37 +0000
Subject: 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/InputManager.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'services/inputflinger/InputManager.cpp')

diff --git a/services/inputflinger/InputManager.cpp b/services/inputflinger/InputManager.cpp
index f2a0014da4..c7c61cf1ef 100644
--- a/services/inputflinger/InputManager.cpp
+++ b/services/inputflinger/InputManager.cpp
@@ -111,10 +111,8 @@ void InputManager::setInputWindows(const std::vector<InputWindowInfo>& infos,
         handlesPerDisplay.emplace(info.displayId, std::vector<sp<InputWindowHandle>>());
         handlesPerDisplay[info.displayId].push_back(new BinderWindowHandle(info));
     }
-    mDispatcher->setInputWindows(handlesPerDisplay);
-
-    if (setInputWindowsListener) {
-        setInputWindowsListener->onSetInputWindowsFinished();
+    for (auto const& i : handlesPerDisplay) {
+        mDispatcher->setInputWindows(i.second, i.first, setInputWindowsListener);
     }
 }
 
-- 
cgit v1.2.3-59-g8ed1b