From 5375e70d9681c82c5cc090627bcfa63f9d23f19c Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Tue, 20 Feb 2024 14:37:30 +0000 Subject: [PATCH 1/3] Enable Secretkeeper HAL service on zuma The prebuilts on `main` for zuma devices have been updated to include: - the Secretkeeper TA in Trusty - the ABL changes to retrieve the Secretkeeper identity pub key. So enable the corresponding HAL service for Secretkeeper when the relevant build flag is enabled. Bug: 291228655 Bug: 306364873 Test: VtsSecretkeeperTargetTest on shiba Change-Id: Ida12d0742c1e74e15e0f5606ab19cdb90afbcb2b --- device.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/device.mk b/device.mk index e3818ced..2213ebc1 100644 --- a/device.mk +++ b/device.mk @@ -89,6 +89,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 # Set the environment variable to switch the Keymint HAL service to Rust TRUSTY_KEYMINT_IMPL := rust +ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) + # Set the environment variable to enable the Secretkeeper HAL service. + SECRETKEEPER_ENABLED := true +endif + # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -833,7 +838,7 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google/trusty/common PRODUCT_PACKAGES += \ - trusty_metricsd + trusty_metricsd $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma) PRODUCT_PACKAGES += \ From 553b0f5504265a046c62f28e6b4e5f4b78734a00 Mon Sep 17 00:00:00 2001 From: Chungro Lee Date: Fri, 16 Feb 2024 00:33:57 +0000 Subject: [PATCH 2/3] pixelstats: zuma: add Learning/Update/ModelLoad path Upload more FG data to analyze its trends Bug: 317827237 Change-Id: Id6cff09063ece9c08647f01dfd92bbe2e8e29580 Signed-off-by: Chungro Lee --- pixelstats/pixelstats-vendor.zuma.rc | 2 ++ pixelstats/service.cpp | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pixelstats/pixelstats-vendor.zuma.rc b/pixelstats/pixelstats-vendor.zuma.rc index 70d875ea..6f6da84d 100644 --- a/pixelstats/pixelstats-vendor.zuma.rc +++ b/pixelstats/pixelstats-vendor.zuma.rc @@ -1,4 +1,6 @@ on property:sys.boot_completed=1 + chown system system /sys/class/power_supply/maxfg_base/fg_learning_events + chown system system /sys/class/power_supply/maxfg/fg_learning_events start vendor.pixelstats_vendor on post-fs-data chown system system /sys/kernel/metrics/irq/stats_reset diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index b58bf67b..d764db58 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -122,7 +122,17 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { const struct UeventListener::UeventPaths ueventPaths = { .AudioUevent = "/devices/virtual/amcs/amcs", - .TypeCPartnerUevent = "PRODUCT_TYPE="}; + .TypeCPartnerUevent = "PRODUCT_TYPE=", + .FGLearningPath = { + "/sys/class/power_supply/maxfg/fg_learning_events", + "/sys/class/power_supply/maxfg_base/fg_learning_events" + }, + .FwUpdatePath = "", + .FGModelLoadingPath = { + "/sys/class/power_supply/maxfg/m5_model_state", + "/sys/class/power_supply/maxfg_base/m5_model_state" + } +}; int main() { LOG(INFO) << "starting PixelStats"; From 79baa6c871d1972fa21867d778600d3600350134 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Mon, 19 Feb 2024 05:58:23 +0000 Subject: [PATCH 3/3] Add sepolicy include to zuma. Bug: 325422902 Test: Manual, system booted without sepolicy denied error. Change-Id: Ife2291ac6e510321217038cdd360603a0f3e3c57 Signed-off-by: Mark Chang --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index e3818ced..c1671f92 100644 --- a/device.mk +++ b/device.mk @@ -1192,8 +1192,8 @@ include device/google/gs-common/pixel_ril/ril.mk endif # Touch service -include hardware/google/pixel/input/twoshay.mk include device/google/gs-common/touch/twoshay/aidl_zuma.mk +include device/google/gs-common/touch/twoshay/twoshay.mk # Allow longer timeout for incident report generation in bugreport # Overriding in /product partition instead of /vendor intentionally,