From da8582fd02c00598eb31fb84176aa1912a37bc69 Mon Sep 17 00:00:00 2001
From: Julian Thomassie <julianth@google.com>
Date: Mon, 8 Apr 2024 16:51:23 +0000
Subject: [PATCH 1/3] Add missing POST_NOTIFICATION pregrant for SCONE

Pregrant was previously approved on b/233243584, but never added for
zumapro.

Bug: 331811749
Test: manual
Change-Id: I4decd647f87cefe85fb39ef14055e41496eeaedb
---
 default-permissions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index ad72ca3..6230f4c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -77,6 +77,8 @@
         <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
         <!-- Used to call ActivityTransition API for Smart PNO -->
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
+        <!-- Used to display notifications for Spectrum Speedboost and Satellite eSOS -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
     <exception

From 21105e03840f8cb4c741491669641c5bc3576f89 Mon Sep 17 00:00:00 2001
From: Spade Lee <spadelee@google.com>
Date: Mon, 4 Mar 2024 17:23:03 +0000
Subject: [PATCH 2/3] pixelstats: add max77779fg abnormal event path for
 zumapro

Bug: 333314833
Change-Id: I5493e3d6b514d615bfe0a4b0e3468052d8ba8ca5
Merged-In: I5493e3d6b514d615bfe0a4b0e3468052d8ba8ca5
Signed-off-by: Spade Lee <spadelee@google.com>
(cherry picked from commit 2912685d47b2ba38e460cc5e453d3ab0e37bf490)
---
 pixelstats/pixelstats-vendor.zumapro.rc | 5 +++--
 pixelstats/service.cpp                  | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pixelstats/pixelstats-vendor.zumapro.rc b/pixelstats/pixelstats-vendor.zumapro.rc
index 5993978..aca60f7 100644
--- a/pixelstats/pixelstats-vendor.zumapro.rc
+++ b/pixelstats/pixelstats-vendor.zumapro.rc
@@ -1,7 +1,8 @@
 on property:sys.boot_completed=1
 	chown system system /sys/class/power_supply/max77779fg/fg_learning_events
+	chown system system /sys/class/power_supply/max77779fg/fg_abnormal_events
 	chown system system /sys/class/power_supply/maxfg_base/fg_learning_events
-    chown system system /sys/devices/platform/maxim,max77779fwu/update_stats
+	chown system system /sys/devices/platform/maxim,max77779fwu/update_stats
 	start vendor.pixelstats_vendor
 on post-fs-data
     chown system system /sys/kernel/metrics/irq/stats_reset
@@ -9,4 +10,4 @@ service vendor.pixelstats_vendor /vendor/bin/pixelstats-vendor
     class hal
     user system
     group system context_hub readproc
-    disabled
\ No newline at end of file
+    disabled
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 690ac75..02fe03b 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -104,7 +104,8 @@ const struct UeventListener::UeventPaths ueventPaths = {
         .FGModelLoadingPath = {
             "/sys/class/power_supply/max77779fg/model_state",
             "/sys/class/power_supply/maxfg_base/model_state"
-        }
+        },
+	.FGAbnlPath = "/sys/class/power_supply/max77779fg/fg_abnormal_events"
  };
 
 int main() {

From 22fc2d880c11675aa1cb2578a3d25b2a93185a8d Mon Sep 17 00:00:00 2001
From: Chungro Lee <chungro@google.com>
Date: Mon, 11 Mar 2024 20:14:38 +0000
Subject: [PATCH 3/3] 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: I5f5281e42d15477d586c732372c476c494d880f3
Merged-In: I5f5281e42d15477d586c732372c476c494d880f3
Signed-off-by: Chungro Lee <chungro@google.com>
(cherry picked from commit aa343943069e2c4442bfe3a48da8d9a1098ed87e)
---
 pixelstats/service.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 02fe03b..56744c4 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -80,6 +80,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/class/power_supply/max77779fg/gmsr",
         "/sys/class/power_supply/maxfg_base/gmsr",
     },
+    .FGLearningPath = {
+        "/sys/class/power_supply/max77779fg/fg_learning_events",
+        "/sys/class/power_supply/maxfg_base/fg_learning_events"
+    },
+    .FGModelLoadingPath = {
+        "/sys/class/power_supply/max77779fg/model_state",
+        "/sys/class/power_supply/maxfg_base/model_state"
+    },
     .PDMStatePath = "/sys/devices/platform/audiometrics/pdm_state",
     .WavesPath = "/sys/devices/platform/audiometrics/waves",
     .AdaptedInfoCountPath = "/sys/devices/platform/audiometrics/adapted_info_active_count",
@@ -96,15 +104,7 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
         .TypeCPartnerUevent = "PRODUCT_TYPE=",
-        .FGLearningPath = {
-            "/sys/class/power_supply/max77779fg/fg_learning_events",
-            "/sys/class/power_supply/maxfg_base/fg_learning_events"
-        },
         .FwUpdatePath = "/sys/devices/platform/maxim,max77779fwu/update_stats",
-        .FGModelLoadingPath = {
-            "/sys/class/power_supply/max77779fg/model_state",
-            "/sys/class/power_supply/maxfg_base/model_state"
-        },
 	.FGAbnlPath = "/sys/class/power_supply/max77779fg/fg_abnormal_events"
  };