| commit | e591b55b7028d3f092e0377f96ea68c990d62903 | [log] [tgz] |
|---|---|---|
| author | Dominik Laskowski <domlaskowski@google.com> | Fri Sep 09 10:44:56 2022 -0700 |
| committer | Dominik Laskowski <domlaskowski@google.com> | Tue Oct 04 16:42:33 2022 -0400 |
| tree | 72b07bf4d42eac4c574f9fa839cebf7bc313b7e4 | |
| parent | 36dced862c21c7cfdb73ff9aa85e5c2b45739add [diff] |
SF: Identify the active display with its ID The active display (and the superseding concept of leader display) is necessarily physical, so constrain its type to PhysicalDisplayId. Bug: 241285876 Test: Fold/unfold Change-Id: If83c908446e5e5267dfcb15189a26b779d75b216
diff --git a/services/surfaceflinger/tests/unittests/SurfaceFlinger_PowerHintTest.cpp b/services/surfaceflinger/tests/unittests/SurfaceFlinger_PowerHintTest.cpp index e256d2c..bc66961 100644 --- a/services/surfaceflinger/tests/unittests/SurfaceFlinger_PowerHintTest.cpp +++ b/services/surfaceflinger/tests/unittests/SurfaceFlinger_PowerHintTest.cpp
@@ -97,7 +97,7 @@ .setNativeWindow(mNativeWindow) .setPowerMode(hal::PowerMode::ON) .inject(); - mFlinger.mutableActiveDisplayToken() = mDisplay->getDisplayToken(); + mFlinger.mutableActiveDisplayId() = mDisplay->getPhysicalId(); } void SurfaceFlingerPowerHintTest::setupScheduler() {
diff --git a/services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPowerModeInternalTest.cpp b/services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPowerModeInternalTest.cpp index 9e54083..6f84437 100644 --- a/services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPowerModeInternalTest.cpp +++ b/services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPowerModeInternalTest.cpp
@@ -262,7 +262,7 @@ if (injector.physicalDisplay() .transform(&display::PhysicalDisplay::isInternal) .value_or(false)) { - test->mFlinger.mutableActiveDisplayToken() = display->getDisplayToken(); + test->mFlinger.mutableActiveDisplayId() = display->getPhysicalId(); } return display;
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h index e624ab9..fdd55a5 100644 --- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h +++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -530,7 +530,7 @@ auto& mutableHwcDisplayData() { return getHwComposer().mDisplayData; } auto& mutableHwcPhysicalDisplayIdMap() { return getHwComposer().mPhysicalDisplayIdMap; } auto& mutablePrimaryHwcDisplayId() { return getHwComposer().mPrimaryHwcDisplayId; } - auto& mutableActiveDisplayToken() { return mFlinger->mActiveDisplayToken; } + auto& mutableActiveDisplayId() { return mFlinger->mActiveDisplayId; } auto fromHandle(const sp<IBinder>& handle) { return mFlinger->fromHandle(handle);