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

Commit c090ab42 authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

Merge "Add the relative address when DisplayDeviceInfo gets copied between... 

Merge "Add the relative address when DisplayDeviceInfo gets copied between SurfaceFlinger and SurfaceComposer."
parents 7e24efc3 1de958d9

libs/gui/SurfaceComposerClient.cpp

+4 −0
Original line number Diff line number Diff line
@@ -2238,6 +2238,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
@@ -7433,6 +7433,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;