commit 9f0fc5906280883cac1129a7947b741f45a97ae1
author Huihong Luo <huisinro@google.com> Wed Jan 17 12:29:26 2024 -0800
committer Leon Scroggins III <scroggo@google.com> Tue Feb 06 13:14:11 2024 -0500
tree e6a8c1e28ba1d665465c9e798883bc4030521010
parent 79e5f98dc006a77c412f877e3284619066304057

Report hotplug error to framework

When active mode can't be found for a display.
Bug: 320703046
Test: atest libsurfaceflinger_unittest:HotplugTest

Change-Id: I352a4b58e97620ee2ce8681fe4e7a1f3307bc0a4

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 7f50168..160695b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3395,8 +3395,12 @@
 
     auto [displayModes, activeMode] = loadDisplayModes(displayId);
     if (!activeMode) {
-        // TODO(b/241286153): Report hotplug failure to the framework.
         ALOGE("Failed to hotplug display %s", to_string(displayId).c_str());
+        if (FlagManager::getInstance().hotplug2()) {
+            mScheduler->onHotplugConnectionError(mAppConnectionHandle,
+                                                 static_cast<int32_t>(
+                                                         DisplayHotplugEvent::ERROR_UNKNOWN));
+        }
         getHwComposer().disconnectDisplay(displayId);
         return nullptr;
     }