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/DisplayHardware/DisplayMode.h

diff --git a/services/surfaceflinger/DisplayHardware/DisplayMode.h b/services/surfaceflinger/DisplayHardware/DisplayMode.h
index 69fd00e..7ae54f1 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayMode.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayMode.h
@@ -17,11 +17,12 @@
 #pragma once
 
 #include "DisplayHardware/Hal.h"
-#include "Scheduler/HwcStrongTypes.h"
+#include "Scheduler/StrongTyping.h"
 
 #include <android/configuration.h>
 #include <utils/Timers.h>
 
+#include <cstddef>
 #include <memory>
 #include <vector>
 
@@ -32,6 +33,7 @@
 class DisplayMode;
 using DisplayModePtr = std::shared_ptr<const DisplayMode>;
 using DisplayModes = std::vector<DisplayModePtr>;
+using DisplayModeId = StrongTyping<size_t, struct DisplayModeIdTag, Compare, Hash>;
 
 class DisplayMode {
 public:
@@ -43,7 +45,7 @@
             return std::const_pointer_cast<const DisplayMode>(std::move(mDisplayMode));
         }
 
-        Builder& setId(HwcConfigIndexType id) {
+        Builder& setId(DisplayModeId id) {
             mDisplayMode->mId = id;
             return *this;
         }
@@ -104,7 +106,7 @@
         std::shared_ptr<DisplayMode> mDisplayMode;
     };
 
-    HwcConfigIndexType getId() const { return mId; }
+    DisplayModeId getId() const { return mId; }
     hal::HWConfigId getHwcId() const { return mHwcId; }
 
     int32_t getWidth() const { return mWidth; }
@@ -118,7 +120,7 @@
     explicit DisplayMode(hal::HWConfigId id) : mHwcId(id) {}
 
     hal::HWConfigId mHwcId;
-    HwcConfigIndexType mId;
+    DisplayModeId mId;
 
     int32_t mWidth = -1;
     int32_t mHeight = -1;