commit 9fc9513410b4b3e6889f5b201e5235ec062bddcd
author Ady Abraham <adyabr@google.com> Tue Mar 30 20:08:39 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 30 20:08:39 2021 +0000
tree 3681d2c2dec4b3a9357c8a7a77fcf85358a113e4
parent 0e2b9747cfb707d3e63c6986acf9adfaeb9d4716
parent 2e9c703f2ed971f0a1654bc1a3271190caa485ad

Merge "SF: HWComposer::isConnected can be called before a display is connected" into sc-dev

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index fe957c0..b73d032 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 {