commit 13f485881efbaa1eca316b50f1e2a444b5a77963
author Lucas Berthou <berlu@google.com> Thu Jan 16 16:25:08 2025 +0000
committer Lucas Berthou <berlu@google.com> Mon Jan 27 18:49:42 2025 +0000
tree af440c5018eadc340b58b595298e61c84ad0550a
parent 1da782184ffb4015139869346a657a937d593119

SF: prerequisite refactor to remove deprecated HIDL enum

Bug: 383794355
Test: manual
Flag: EXEMPT refactor
Change-Id: Iaf2d6e6ef03be7a7ca2e863356c5087b1f3319a4

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index c2e687f..6fdf942 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -76,6 +76,7 @@
 #include "Display/VirtualDisplaySnapshot.h"
 #include "DisplayDevice.h"
 #include "DisplayHardware/HWC2.h"
+#include "DisplayHardware/HWComposer.h"
 #include "DisplayIdGenerator.h"
 #include "Effects/Daltonizer.h"
 #include "FrontEnd/DisplayInfo.h"
@@ -130,7 +131,6 @@
 class FpsReporter;
 class TunnelModeEnabledReporter;
 class HdrLayerInfoReporter;
-class HWComposer;
 class IGraphicBufferProducer;
 class Layer;
 class MessageBase;
@@ -1282,7 +1282,7 @@
 
     struct HotplugEvent {
         hal::HWDisplayId hwcDisplayId;
-        hal::Connection connection = hal::Connection::INVALID;
+        HWComposer::HotplugEvent event;
     };
 
     bool mIsHdcpViaNegVsync = false;