summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/DisplayDevice.cpp
diff options
context:
space:
mode:
author Marin Shalamanov <shalamanov@google.com> 2021-01-15 15:06:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-01-15 15:06:38 +0000
commit88ce0fa5e59d2b19ece38708672baebbc4a19bc0 (patch)
tree9f656b0551419932c485e1a98a7872152d956eea /services/surfaceflinger/DisplayDevice.cpp
parent2416f131f6102f9c60ddbe73f8d43f9f75da1c13 (diff)
parent3ea1d605f2edca071ed7c3bbc6de2c7fbbe55e5e (diff)
Merge changes I8cb45020,I8787dcca
* changes: SF: Remove display config functions from HWC2 SF: Clean up Scheduler::registerLayer
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp2
1 files changed, 1 insertions, 1 deletions
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<int32_t>(mPowerMode));
- StringAppendF(&result, "activeConfig=%d, ", mActiveConfig.value());
+ StringAppendF(&result, "activeConfig=%zu, ", mActiveConfig.value());
StringAppendF(&result, "deviceProductInfo=");
if (mDeviceProductInfo) {
mDeviceProductInfo->dump(result);