From 6e91bd9f0bf7cf5d076c0538c7ada5b2cb294a53 Mon Sep 17 00:00:00 2001 From: Hongyang Jiao Date: Fri, 23 Feb 2024 19:34:22 +0000 Subject: [PATCH 1/2] Add betterbug mk to gs201 Bug: 322543833 Test: local test, recorded in http://shortn/_iEz9DTCHgo Change-Id: I88809df5449909ac528d38e07fa95b8f49bbfd00 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index d6b2aac6..04585d5b 100644 --- a/device.mk +++ b/device.mk @@ -37,6 +37,7 @@ include device/google/gs-common/sota_app/factoryota.mk include device/google/gs-common/misc_writer/misc_writer.mk include device/google/gs-common/gyotaku_app/gyotaku.mk include device/google/gs-common/bootctrl/bootctrl_aidl.mk +include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif From 85b26e93ccb31d64b4052fc5f00a3aa0016d633c Mon Sep 17 00:00:00 2001 From: Jenny Ho Date: Wed, 21 Feb 2024 20:13:24 +0800 Subject: [PATCH 2/2] pixelstats: added multiple GMSR paths support different project paths Bug: 308364170 Change-Id: I065f8e844d13d1d6d36c36ef689ff6c34b3e3fa6 Signed-off-by: Jenny Ho --- pixelstats/service.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 714a24dd..595befbe 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -88,7 +88,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { .IRQStatsResetPath = "/sys/kernel/metrics/irq/stats_reset", .ModemPcieLinkStatsPath = "/sys/devices/platform/11920000.pcie/link_stats", .WifiPcieLinkStatsPath = "/sys/devices/platform/14520000.pcie/link_stats", - .GMSRPath = "/sys/class/power_supply/maxfg/gmsr", + .GMSRPath = { + "/sys/class/power_supply/maxfg/gmsr", + "/sys/class/power_supply/maxfg_base/gmsr", + }, .TotalCallCountPath = "/sys/devices/platform/audiometrics/call_count" };