From 3ea1d605f2edca071ed7c3bbc6de2c7fbbe55e5e Mon Sep 17 00:00:00 2001 From: Marin Shalamanov Date: Wed, 16 Dec 2020 19:59:39 +0100 Subject: SF: Remove display config functions from HWC2 HWC2 is unnecessary stateful stopgap between HWComposer and ComposerHal. In this CL the following functions are removed from HWC2 * getActiveConfig * getActiveConfigIndex * getDisplayVsyncPeriod and ComposerHal is called directly from HWComposer. This way display configs are stored only in HWComposer. Additionally HWC2::Display::Config is renamed to DisplayMode and it's extracted in its own file. From the perspective of SurfaceFlinger this CL is not modifying behaviour. Bug: 159590486 Bug: 175678215 Test: atest libsurfaceflinger_unittest Change-Id: I8cb450209adf038d891cff00d1c2690c8e6d94f7 --- services/surfaceflinger/DisplayDevice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services/surfaceflinger/DisplayDevice.cpp') diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index cbc201fabc..8551365a3b 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -210,7 +210,7 @@ void DisplayDevice::dump(std::string& result) const { result.append(" "); StringAppendF(&result, "powerMode=%s (%d), ", to_string(mPowerMode).c_str(), static_cast(mPowerMode)); - StringAppendF(&result, "activeConfig=%d, ", mActiveConfig.value()); + StringAppendF(&result, "activeConfig=%zu, ", mActiveConfig.value()); StringAppendF(&result, "deviceProductInfo="); if (mDeviceProductInfo) { mDeviceProductInfo->dump(result); -- cgit v1.2.3-59-g8ed1b