commit 5e7ee86d60fde894e5162e3a3cd2d962ce62d4db
author Ady Abraham <adyabr@google.com> Wed Jun 23 17:43:41 2021 -0700
committer Ady Abraham <adyabr@google.com> Thu Jul 01 23:20:55 2021 -0700
tree 2d8d320fd045cd80a8c3a4e2924d355577a62323
parent 3e461c42ed735227ea6c2bb1b4f5eb34cbf9f900

SF: add PhysicalDisplayId to DisplayMode

A DisplayMode should include the PhysicalDisplayId it
belongs to we could use that to know which display the
mode belogs to.

Change-Id: I781cf30c5ccf886f061a45073b369b4f04cc9140
Bug: 187539899
Test: SF unit tests
Test: refresh rate switching is working on device with
more than one display

Change-Id: I9c73b43384cbe934f7584695e5fe5c53ab402bfb

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0b37dfc..0892d65 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2531,6 +2531,7 @@
     for (const auto& hwcMode : hwcModes) {
         newModes.push_back(DisplayMode::Builder(hwcMode.hwcId)
                                    .setId(DisplayModeId{nextModeId++})
+                                   .setPhysicalDisplayId(displayId)
                                    .setWidth(hwcMode.width)
                                    .setHeight(hwcMode.height)
                                    .setVsyncPeriod(hwcMode.vsyncPeriod)