commit a24822dd13cde3f21ac75e56fed0db0722acfd55
author Weilun Du <wdu@google.com> Thu Dec 09 19:35:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 09 19:35:34 2021 +0000
tree acfe33f6ed70b8799bb51c49250d31c620383d38
parent 302d8d4be8f8e8808ad988950fda0a41bb85d899
parent d00847d7262bf6e620ea12f2e2c43a026bdbfc5a

Merge "Remove warning when associated display is ADISPLAY_ID_NONE."

services/inputflinger/reader/InputReader.cpp

diff --git a/services/inputflinger/reader/InputReader.cpp b/services/inputflinger/reader/InputReader.cpp
index 0b632f7..30f25e5 100644
--- a/services/inputflinger/reader/InputReader.cpp
+++ b/services/inputflinger/reader/InputReader.cpp
@@ -782,12 +782,8 @@
 
     std::optional<int32_t> associatedDisplayId = device->getAssociatedDisplayId();
     // No associated display. By default, can dispatch to all displays.
-    if (!associatedDisplayId) {
-        return true;
-    }
-
-    if (*associatedDisplayId == ADISPLAY_ID_NONE) {
-        ALOGW("Device %s is associated with display ADISPLAY_ID_NONE.", device->getName().c_str());
+    if (!associatedDisplayId ||
+            *associatedDisplayId == ADISPLAY_ID_NONE) {
         return true;
     }