Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffca0ade authored by Gil Dekel's avatar Gil Dekel
Browse files

SF: Cache display port in DisplayIdentification on onHotplugConnect 

In order to be able to remove direct dependencies on a DisplayId's int
value, we have to find alternatives for the API it provides. One such
piece of data is a display port, which is encoded directly in the ID int
value.

Cache the port as it is retrieved from HWC into DisplayIdentification so
it can be served later via alternative ISurfaceComposer APIs.

Bug: 374163881
Bug: 377307639
Flag: EXEMPT refactor
Test: libsurfaceflinger_unittest
Change-Id: If255418ed4047531417004c4a1fd710061d93685
parent 27cb4c81

libs/ui/DisplayIdentification.cpp

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ std::optional<DisplayIdentificationInfo> parseDisplayIdentificationData( 
    return DisplayIdentificationInfo{

            .id = displayId,

            .name = std::string(edid->displayName),

            .port = port,

            .deviceProductInfo = buildDeviceProductInfo(*edid),

            .preferredDetailedTimingDescriptor = edid->preferredDetailedTimingDescriptor,

    };

libs/ui/include/ui/DisplayIdentification.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct DetailedTimingDescriptor { 
struct DisplayIdentificationInfo {

    PhysicalDisplayId id;

    std::string name;

    uint8_t port;

    std::optional<DeviceProductInfo> deviceProductInfo;

    std::optional<DetailedTimingDescriptor> preferredDetailedTimingDescriptor;

};

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1180,6 +1180,7 @@ std::optional<DisplayIdentificationInfo> HWComposer::onHotplugConnect( 
            return DisplayIdentificationInfo{.id = PhysicalDisplayId::fromPort(port),

                                             .name = isPrimary ? "Primary display"

                                                               : "Secondary display",

                                             .port = port,

                                             .deviceProductInfo = std::nullopt};

        }();