From 7e12c967fb059bbc4b11240283ca0a8a574ae3f7 Mon Sep 17 00:00:00 2001
From: Hongyang Jiao <jiaohy@google.com>
Date: Fri, 23 Feb 2024 19:31:18 +0000
Subject: [PATCH 1/2] Add betterbug mk to gs101

Bug: 322543833
Test: local test, recorded in http://shortn/_iEz9DTCHgo
Change-Id: Id10b95f2c0169f036f759a513cf16703d5f4e732
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index baa919f1..9edf65e8 100644
--- a/device.mk
+++ b/device.mk
@@ -36,6 +36,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 oriole raven bluejay, $(TARGET_PRODUCT)),)
   include device/google/gs-common/bcmbt/dump/dumplog.mk
 endif

From 49ae2f663bbdc44b803b6c77d98338f0767c9504 Mon Sep 17 00:00:00 2001
From: Jenny Ho <hsiufangho@google.com>
Date: Wed, 21 Feb 2024 20:11:07 +0800
Subject: [PATCH 2/2] pixelstats: added multiple GMSR paths

support different project paths

Bug: 308364170
Change-Id: I4ef71192ad2b2717c515164bd65463759320b32a
Signed-off-by: Jenny Ho <hsiufangho@google.com>
---
 pixelstats/service.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 96d10645..d4b803aa 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -69,7 +69,10 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
                 "/sys/kernel/metrics/thermal/tr_by_group/spmic/stats_reset"
             }
         },
-        .GMSRPath = "/sys/class/power_supply/maxfg/gmsr"
+        .GMSRPath = {
+            "/sys/class/power_supply/maxfg/gmsr",
+            "/sys/class/power_supply/maxfg_base/gmsr",
+        },
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {