commit a4e9ad4a28553e6f6059b85e3c9e203384c5ae03
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 02 02:02:16 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Mar 02 02:02:16 2024 +0000
tree 4fb5f013b956e33dc5d09cac357210c396c0c637
parent ec01f2ca9b22b27fe8d19600f23b5efc0d746425
parent 49ae2f663bbdc44b803b6c77d98338f0767c9504

Snap for 11520864 from 49ae2f663bbdc44b803b6c77d98338f0767c9504 to 24Q2-release

Change-Id: I32b254672b3315f6e1ecba40c7af007c4d8e5849

device.mk

diff --git a/device.mk b/device.mk
index baa919f..9edf65e 100644
--- a/device.mk
+++ b/device.mk
@@ -36,6 +36,7 @@
 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

pixelstats/service.cpp

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 96d1064..d4b803a 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -69,7 +69,10 @@
                 "/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 = {