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/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);