From 761ee0a9d1f8e6e062095f36313c4ef73bcaa152 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 23 Sep 2022 10:17:47 +0800 Subject: [PATCH] powerstats: update Display energy consumer Bug: 248391573 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I9e3275a3d3404eede3fa8be696f623260b50c574 Signed-off-by: Darren Hsu --- powerstats/service.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/powerstats/service.cpp b/powerstats/service.cpp index dd6881c..618a745 100644 --- a/powerstats/service.cpp +++ b/powerstats/service.cpp @@ -43,13 +43,11 @@ void addDisplay(std::shared_ptr p) { states)); // Add display energy consumer - /* - * TODO(b/167216667): Add correct display power model here. Must read from display rail - * and include proper coefficients for display states. - */ - p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer(p, - EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", - {{"On: 1600x2560@60", 1}})); + p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( + p, + EnergyConsumerType::DISPLAY, + "Display", + {"VSYS_PWR_DISPLAY"})); } int main() {