commit bb8267b6fc355a21aad63b2383bfe7d92f446bec
author Dominik Laskowski <domlaskowski@google.com> Fri Apr 26 16:23:07 2024 -0400
committer Dominik Laskowski <domlaskowski@google.com> Tue Apr 30 11:53:42 2024 -0400
tree fb600ce8fc978de901b88a1182fbc041b426e8e2
parent c4fe541e51ef33a859d138c189b9d98a1d9afb5b

SF: Split processHotplug

The disconnect case doesn't share much with the connect/reconnect cases,
and splitting the two foreshadows the hook points to register/unregister
the display with DisplayModeController.

Bug: 241285876
Test: presubmit
Change-Id: I0546ab0e8d2e709f6528adcbd9e9bf3a1e16980a

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 44fa806..83b092d 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -1059,10 +1059,11 @@
     bool configureLocked() REQUIRES(mStateLock) REQUIRES(kMainThreadContext)
             EXCLUDES(mHotplugMutex);
 
-    // Returns a string describing the hotplug, or nullptr if it was rejected.
-    const char* processHotplug(PhysicalDisplayId, hal::HWDisplayId, bool connected,
-                               DisplayIdentificationInfo&&) REQUIRES(mStateLock)
-            REQUIRES(kMainThreadContext);
+    // Returns false on hotplug failure.
+    bool processHotplugConnect(PhysicalDisplayId, hal::HWDisplayId, DisplayIdentificationInfo&&,
+                               const char* displayString) REQUIRES(mStateLock, kMainThreadContext);
+    void processHotplugDisconnect(PhysicalDisplayId, const char* displayString)
+            REQUIRES(mStateLock, kMainThreadContext);
 
     sp<DisplayDevice> setupNewDisplayDeviceInternal(
             const wp<IBinder>& displayToken,