From 32305100e247d73e12cecccece17481aa8cda462 Mon Sep 17 00:00:00 2001 From: Hongyang Jiao Date: Fri, 23 Feb 2024 19:36:45 +0000 Subject: [PATCH 1/2] Add betterbug mk to zuma Bug: 322543833 Test: local test, recorded in http://shortn/_iEz9DTCHgo Change-Id: Idd83168e4e4bea43ec88afbc0823a76e879e9674 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index fdf33fa8..4c1b246a 100644 --- a/device.mk +++ b/device.mk @@ -42,6 +42,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 include device/google/zuma/dumpstate/item.mk From 45b0145f0cf0b663b5d3599cc6c6e687d1e52ec4 Mon Sep 17 00:00:00 2001 From: Jenny Ho Date: Wed, 21 Feb 2024 20:13:55 +0800 Subject: [PATCH 2/2] pixelstats: added multiple GMSR paths support different project paths Bug: 308364170 Change-Id: Ifd5f1b609c0bf5fa98677f9880bfa29496add95d 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 d764db58..bb64ea62 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -101,7 +101,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { .OffloadEffectsIdPath = "/sys/devices/platform/audiometrics/offload_effects_id", .OffloadEffectsDurationPath = "/sys/devices/platform/audiometrics/offload_effects_duration", .BluetoothAudioUsagePath = "/sys/devices/platform/audiometrics/bt_usage", - .GMSRPath = "/sys/class/power_supply/maxfg/gmsr", + .GMSRPath = { + "/sys/class/power_supply/maxfg/gmsr", + "/sys/class/power_supply/maxfg_base/gmsr", + }, .DisplayPortStatsPaths = { "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/link_negotiation_failures", "/sys/devices/platform/exynos-drm/displayport/drm-displayport-stats/edid_read_failures",