commit 1de958d9519f0465932fb62a865b20161294205b
author Kriti Dang <kritidang@google.com> Mon May 30 15:26:58 2022 +0200
committer Kriti Dang <kritidang@google.com> Wed Jun 01 08:06:15 2022 +0000
tree 42233c53c0a32bd39ab5cba76bda7bef2f516439
parent 638f50a3eb96bd2f0df441b17f4319c92bc2b2c6

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

services/surfaceflinger/SurfaceFlinger.cpp

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;