From 436e91448799c2dabd64e714efb06e66975410a8 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Thu, 15 Jun 2023 18:42:20 +0800
Subject: [PATCH] powerstats: update Display state residency and energy
 consumer

Bug: 263553183
Bug: 263553489
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I9bdb5fcd1af4816e677c1286e51d30963fac796a
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/akita/service.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/powerstats/akita/service.cpp b/powerstats/akita/service.cpp
index 342d6ca..54f5232 100644
--- a/powerstats/akita/service.cpp
+++ b/powerstats/akita/service.cpp
@@ -35,11 +35,11 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
     // Add display residency stats
     std::vector<std::string> states = {
         "Off",
-        "LP: 1080x2340@30",
-        "On: 1080x2340@60",
-        "On: 1080x2340@90",
-        "HBM: 1080x2340@60",
-        "HBM: 1080x2340@90"};
+        "LP: 1080x2400@30",
+        "On: 1080x2400@60",
+        "On: 1080x2400@90",
+        "HBM: 1080x2400@60",
+        "HBM: 1080x2400@90"};
 
     p->addStateResidencyDataProvider(std::make_unique<DisplayStateResidencyDataProvider>(
             "Display",
@@ -48,12 +48,12 @@ void addDisplay(std::shared_ptr<PowerStats> p) {
 
     // Add display energy consumer
     p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(
-            p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display",
-            {{"LP: 1080x2340@30", 1},
-             {"On: 1080x2340@60", 2},
-             {"On: 1080x2340@90", 3},
-             {"HBM: 1080x2340@60", 4},
-             {"HBM: 1080x2340@90", 5}}));
+            p, EnergyConsumerType::DISPLAY, "Display", {"VSYS_PWR_DISPLAY"}, "Display",
+            {{"LP: 1080x2400@30", 1},
+             {"On: 1080x2400@60", 2},
+             {"On: 1080x2400@90", 3},
+             {"HBM: 1080x2400@60", 4},
+             {"HBM: 1080x2400@90", 5}}));
 }
 
 int main() {