From 7f1a1ba11098cbf663dfad8e2d4cf8c4c738c0aa Mon Sep 17 00:00:00 2001 From: bladechiu Date: Wed, 21 Sep 2022 06:43:17 +0800 Subject: [PATCH 1/4] Set correct the isp tuning project name bug: 244499712 Test: Added Unit test Change-Id: I9ab519174422b169d4bf32c42c5276d8e10a9257 Merged-In: If4ee5e0bba8c78addc3771a272cbaf32a80b1fd6 --- device-tangorpro.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 78bbe34..331e034 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -45,7 +45,7 @@ include device/google/tangorpro/audio/tangorpro/audio-tables.mk include device/google/gs201/device-shipping-common.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml -$(call soong_config_set,lyric,tuning_product,cloudripper) +$(call soong_config_set,lyric,tuning_product,tangorpro) $(call soong_config_set,google3a_config,target_device,cloudripper) ifeq ($(filter factory_tangorpro, $(TARGET_PRODUCT)),) From 761ee0a9d1f8e6e062095f36313c4ef73bcaa152 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 23 Sep 2022 10:17:47 +0800 Subject: [PATCH 2/4] 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() { From e4a986aba2358a2e1a9e1ed8728cc2b8a9e0c420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:57:38 +0000 Subject: [PATCH 3/4] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: Idbec3553d9eca43a7c7fb4c36f3d3a1ceac63d77 Merged-In: Idbec3553d9eca43a7c7fb4c36f3d3a1ceac63d77 --- device-tangorpro.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/device-tangorpro.mk b/device-tangorpro.mk index aadf18c..b2abbb3 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -46,7 +46,9 @@ include device/google/tangorpro/audio/tangorpro/audio-tables.mk include device/google/gs201/device-shipping-common.mk DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml -$(call soong_config_set,lyric,tuning_product,tangorpro) +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,tangorpro) +$(call soong_config_set,lyric,tuning_product,tangor) $(call soong_config_set,google3a_config,target_device,cloudripper) ifeq ($(filter factory_tangorpro, $(TARGET_PRODUCT)),) From 3c7314c4be74391ba42e70aac34175865318d75a Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Fri, 23 Sep 2022 13:38:40 -0700 Subject: [PATCH 4/4] Add Ownership to powerhint files Bug: 248115959 Signed-off-by: Taeju Park Change-Id: I9b34950be21ea0a6718d11a09bb81605dc8c1d90 --- OWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..1451bd8 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com