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
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index 3446b1b..53f3187 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -2193,6 +2193,10 @@
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;
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 040014d..6ea9abf 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7394,6 +7394,8 @@
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;