From 63e9c666f2538a209cc05cc6a688c016ac9682e8 Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 26 Aug 2022 03:52:40 +0000 Subject: [PATCH 1/2] Revert "dck: pick up recovery mode library for digital car key w..." Revert "move digital car key wiping to gs-common" Revert "clear secure element of Digital Car Keys during factory ..." Revert "dck: switch to gs--common implementation of digital car ..." Revert submission 19734547-b203234558-qpr1 Reason for revert: see b/243864778 Reverted Changes: I53967a5e8:dck: pick up recovery mode library for digital car... I8fd944c60:dck: switch to gs--common implementation of digita... I6e8c80818:move digital car key wiping to gs-common I60052ca58:Support calling WipeKeys with out a ui object I459d81800:clear secure element of Digital Car Keys during fa... Change-Id: Ic3f42d0d2c6c78be47cacf9794e7727e6ee5475f --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 0f7c8822..9ca97737 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -414,6 +414,3 @@ BOARD_KERNEL_CMDLINE += log_buf_len=1024K # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 - -# pick up library for cleaning digital car keys on factory reset --include vendor/google_devices/gs-common/proprietary/BoardConfigVendor.mk From 4c5bbfc702a1c1c2d715bd6a5b8b6b5c0501eb00 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Wed, 24 Aug 2022 16:41:24 +0800 Subject: [PATCH 2/2] powerstats: update GPU EnergyConsumer channels GPU EnergyConsumer should include both S8S_VDD_G3D_L2 and S2S_VDD_G3D channels. Bug: 243455584 Test: verified both channels are included Change-Id: Ia63c89ff5ba24d026a4f0b1e368141521e47b611 Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 0e00df71..7a01405d 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -381,7 +381,7 @@ void addGPU(std::shared_ptr p) { {"848000", 4044}}; p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p, - EnergyConsumerType::OTHER, "GPU", {"S8S_VDD_G3D_L2"}, + EnergyConsumerType::OTHER, "GPU", {"S8S_VDD_G3D_L2", "S2S_VDD_G3D"}, {{UID_TIME_IN_STATE, "/sys/devices/platform/28000000.mali/uid_time_in_state"}}, stateCoeffs));