commit 23c4420b2186c7fa4d8cd8b6ff618b8bb00c3333
author Marin Shalamanov <shalamanov@google.com> Tue Dec 22 19:09:20 2020 +0100
committer Marin Shalamanov <shalamanov@google.com> Fri Jan 22 20:59:49 2021 +0100
tree 13edb79d09158941f5c03b6bbf18f5fbe10b3724
parent 2fc978ff528a7c3843524e4e4feea424bc680ffe

SF: Rename HwcConfigIndexType to DisplayModeId

Bug: 159590486
Bug: 176148651
Test: atest libsurfaceflinger_unittest

Change-Id: Ie177b213bb7a8ab9f67a51d2b5cf27d8fd97b780

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 8551365..fe9db5a 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -139,12 +139,12 @@
     return mPowerMode != hal::PowerMode::OFF;
 }
 
-void DisplayDevice::setActiveConfig(HwcConfigIndexType mode) {
-    mActiveConfig = mode;
+void DisplayDevice::setActiveMode(DisplayModeId mode) {
+    mActiveMode = mode;
 }
 
-HwcConfigIndexType DisplayDevice::getActiveConfig() const {
-    return mActiveConfig;
+DisplayModeId DisplayDevice::getActiveMode() const {
+    return mActiveMode;
 }
 
 ui::Dataspace DisplayDevice::getCompositionDataSpace() const {
@@ -210,7 +210,7 @@
     result.append("   ");
     StringAppendF(&result, "powerMode=%s (%d), ", to_string(mPowerMode).c_str(),
                   static_cast<int32_t>(mPowerMode));
-    StringAppendF(&result, "activeConfig=%zu, ", mActiveConfig.value());
+    StringAppendF(&result, "activeConfig=%zu, ", mActiveMode.value());
     StringAppendF(&result, "deviceProductInfo=");
     if (mDeviceProductInfo) {
         mDeviceProductInfo->dump(result);