commit f9d44007ccd474e4cafeac937b57f89dc1296c5c
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 11 05:56:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 11 05:56:35 2020 +0000
tree 2895d58582058d81cd620c7cadc37248387e4fb1
parent 0050943c5ca982c1ce2398414f888d5c66eccb8a
parent d352cb3827b5298e9c9127f7dd75cdf2cd5376de

Merge "Fix consumer closed input channel cause an error occurred (2/2)" into rvc-dev

services/inputflinger/dispatcher/InputDispatcher.cpp

diff --git a/services/inputflinger/dispatcher/InputDispatcher.cpp b/services/inputflinger/dispatcher/InputDispatcher.cpp
index 155021d..1dbcf98 100644
--- a/services/inputflinger/dispatcher/InputDispatcher.cpp
+++ b/services/inputflinger/dispatcher/InputDispatcher.cpp
@@ -2748,7 +2748,10 @@
             // Monitor channels are never explicitly unregistered.
             // We do it automatically when the remote endpoint is closed so don't warn
             // about them.
-            notify = !connection->monitor;
+            const bool stillHaveWindowHandle =
+                    d->getWindowHandleLocked(connection->inputChannel->getConnectionToken()) !=
+                    nullptr;
+            notify = !connection->monitor && stillHaveWindowHandle;
             if (notify) {
                 ALOGW("channel '%s' ~ Consumer closed input channel or an error occurred.  "
                       "events=0x%x",