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

Commit 1de958d9 authored by Kriti Dang's avatar Kriti Dang
Browse files

Add the relative address when DisplayDeviceInfo gets copied between 

SurfaceFlinger and SurfaceComposer.

Bug: 233099345
Test: Tested manually on adt3. connectionToSinkType no longer 0
Change-Id: I463d16591d3a6b0065877ce6d2df2f3422e47009
parent 638f50a3

libs/gui/SurfaceComposerClient.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2193,6 +2193,10 @@ status_t SurfaceComposerClient::getStaticDisplayInfo(const sp<IBinder>& display, 
            size_t count = std::max<size_t>(kMaxPnpIdSize, dpi->manufacturerPnpId.size());

            std::copy_n(dpi->manufacturerPnpId.begin(), count, info.manufacturerPnpId.begin());

        }

        if (dpi->relativeAddress.size() > 0) {

            std::copy(dpi->relativeAddress.begin(), dpi->relativeAddress.end(),

                      std::back_inserter(info.relativeAddress));

        }

        info.productId = dpi->productId;

        if (date.getTag() == Tag::modelYear) {

            DeviceProductInfo::ModelYear modelYear;

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -7394,6 +7394,8 @@ binder::Status SurfaceComposerAIDL::getStaticDisplayInfo(const sp<IBinder>& disp 
        dinfo.manufacturerPnpId =

                std::vector<uint8_t>(dpi->manufacturerPnpId.begin(), dpi->manufacturerPnpId.end());

        dinfo.productId = dpi->productId;

        dinfo.relativeAddress =

                std::vector<uint8_t>(dpi->relativeAddress.begin(), dpi->relativeAddress.end());

        if (const auto* model =

                    std::get_if<DeviceProductInfo::ModelYear>(&dpi->manufactureOrModelDate)) {

            gui::DeviceProductInfo::ModelYear modelYear;