commit e4df875a3b8079bf7fee90ccf80e4cd3a49c1082
author Vishnu Nair <vishnun@google.com> Thu Sep 08 09:17:55 2022 -0700
committer Vishnu Nair <vishnun@google.com> Thu Sep 08 16:48:08 2022 -0700
tree 5ddee612728b7c669b3a001c4951fce022e5af67
parent 40a3eea9ca593a85bd4f310b55455872945c4fce

Revert "InputDispatcher: Blame the window from the focus request for ANR"

This reverts commit 2f5bc8b8cfda7762213268842c13e2280ac02466.

Breaks android.server.wm.AnrTests#slowUiThreadWithKeyEventTriggersAnr

Test: atest android.server.wm.AnrTests#slowUiThreadWithKeyEventTriggersAnr
Bug: 239907039
Change-Id: I45fcaf7d92fdedfa965d563cdb62ad2da3c8f5d4

services/inputflinger/dispatcher/FocusResolver.h

diff --git a/services/inputflinger/dispatcher/FocusResolver.h b/services/inputflinger/dispatcher/FocusResolver.h
index 8a6dfa4..6d11a77 100644
--- a/services/inputflinger/dispatcher/FocusResolver.h
+++ b/services/inputflinger/dispatcher/FocusResolver.h
@@ -62,7 +62,6 @@
     std::optional<FocusResolver::FocusChanges> setFocusedWindow(
             const android::gui::FocusRequest& request,
             const std::vector<sp<android::gui::WindowInfoHandle>>& windows);
-    std::optional<android::gui::FocusRequest> getFocusRequest(int32_t displayId) const;
 
     // Display has been removed from the system, clean up old references.
     void displayRemoved(int32_t displayId);
@@ -113,6 +112,7 @@
     std::optional<FocusResolver::FocusChanges> updateFocusedWindow(
             int32_t displayId, const std::string& reason, const sp<IBinder>& token,
             const std::string& tokenName = "");
+    std::optional<android::gui::FocusRequest> getFocusRequest(int32_t displayId);
 };
 
 } // namespace android::inputdispatcher