Split monitor and window ANR notification paths
Currently, both monitors and windows share the same ANR notification
paths. This means that InputManagerService must be the one to determine
whether the ANR event belongs to a monitor or to a window.
We previously kept track of this by recording the pid inside
InputManagerService. However, there seems to be a path where the gesture
monitor process dies that does not lead to a notification of the java
layer. This resulted in having multiple registered processes.
Now, we will rely on the native layer to manage the pid and to notify
the java layer appropriately.
Bug: 175593831
Test: atest inputflinger_tests
Change-Id: Ie1f7e976dcadcf07a83f78b3ca856b5c43096e2f
diff --git a/services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp b/services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp
index 4e55872..887bdd4 100644
--- a/services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp
+++ b/services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp
@@ -55,12 +55,18 @@
ALOGE("There is no focused window for %s", applicationHandle->getName().c_str());
}
- void notifyConnectionUnresponsive(const sp<IBinder>& connectionToken,
- const std::string& reason) override {
- ALOGE("Connection is not responding: %s", reason.c_str());
+ void notifyWindowUnresponsive(const sp<IBinder>& connectionToken,
+ const std::string& reason) override {
+ ALOGE("Window is not responding: %s", reason.c_str());
}
- void notifyConnectionResponsive(const sp<IBinder>& connectionToken) override {}
+ void notifyWindowResponsive(const sp<IBinder>& connectionToken) override {}
+
+ void notifyMonitorUnresponsive(int32_t pid, const std::string& reason) override {
+ ALOGE("Monitor is not responding: %s", reason.c_str());
+ }
+
+ void notifyMonitorResponsive(int32_t pid) override {}
void notifyInputChannelBroken(const sp<IBinder>&) override {}