From e0d7a249370a93828b128cbffbab7ca9237cad90 Mon Sep 17 00:00:00 2001
From: Chungro Lee <chungro@google.com>
Date: Tue, 12 Mar 2024 17:34:01 +0000
Subject: [PATCH 1/2] pixelstats: move learning/model load path to sysfs

Reporting learning(relaxation) and model loading once a day
 * learning and model loading path moved from uevent to
   sysfs collector.

Bug: 329124192
Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
Signed-off-by: Chungro Lee <chungro@google.com>
---
 pixelstats/service.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index d4b803aa..5b533ceb 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -73,18 +73,18 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
             "/sys/class/power_supply/maxfg/gmsr",
             "/sys/class/power_supply/maxfg_base/gmsr",
         },
+        .FGLearningPath = {
+            "/sys/class/power_supply/maxfg/fg_learning_events"
+        },
+        .FGModelLoadingPath = {
+            "/sys/class/power_supply/maxfg/m5_model_state"
+        }
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
         .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FGLearningPath = {
-            "/sys/class/power_supply/maxfg/fg_learning_events"
-        },
-        .FwUpdatePath = "",
-        .FGModelLoadingPath = {
-            "/sys/class/power_supply/maxfg/m5_model_state"
-        }
+        .FwUpdatePath = ""
 };
 
 int main() {

From 5e69a4432a410714d3c47d7cfe96b6378e5759cc Mon Sep 17 00:00:00 2001
From: Hongyang Jiao <jiaohy@google.com>
Date: Tue, 5 Mar 2024 23:24:05 +0000
Subject: [PATCH 2/2] Add betterbug.mk to gs101

Test: manual test
Bug: 322543833
Change-Id: Iccf4ceabd1c994b804de9e74b50fa8a0ca936af6
---
 device.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/device.mk b/device.mk
index 6202dd04..b3723483 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