commit 2e9c703f2ed971f0a1654bc1a3271190caa485ad
author Ady Abraham <adyabr@google.com> Mon Mar 29 14:01:56 2021 -0700
committer Ady Abraham <adyabr@google.com> Mon Mar 29 14:02:15 2021 -0700
tree a6081b1d93a44cc91080f9fcca4155f0ab32d6e5
parent 4fd10d8d132754131911593ebde6281931e5f54b

SF: HWComposer::isConnected can be called before a display is connected

And for that reason we should not log it as an error.

Bug: 181269159
Test: boot
Change-Id: Ib0c060bdae1bc8d73e772900b7d3367e25599b13

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index ccfaa76..f9a7ee7 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -322,8 +322,11 @@
 }
 
 bool HWComposer::isConnected(PhysicalDisplayId displayId) const {
-    RETURN_IF_INVALID_DISPLAY(displayId, false);
-    return mDisplayData.at(displayId).hwcDisplay->isConnected();
+    if (mDisplayData.count(displayId)) {
+        return mDisplayData.at(displayId).hwcDisplay->isConnected();
+    }
+
+    return false;
 }
 
 std::vector<HWComposer::HWCDisplayMode> HWComposer::getModes(PhysicalDisplayId displayId) const {