From 54d3a9babcf645424fc7a660596d2d6ac3b0beb2 Mon Sep 17 00:00:00 2001
From: Enzo Liao <enzoliao@google.com>
Date: Mon, 18 Mar 2024 22:34:32 +0800
Subject: [PATCH 1/3] Apply common SELinux policies related to ramdumps and
 coredumps to zuma.

Refer: ag/26620507

Bug: 298102808
Design: go/sys-software-logging
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f8c54e99126678b4147885dbcddf7f0a25f1f3a3)
Merged-In: I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7
Change-Id: I9f0d29ef69dc88cb8e876e37aac09ed7331c79b7
---
 device.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/device.mk b/device.mk
index 0a3ef25b..f6164ebb 100644
--- a/device.mk
+++ b/device.mk
@@ -16,7 +16,7 @@
 
 include device/google/gs-common/device.mk
 include device/google/gs-common/gs_watchdogd/watchdog.mk
-include device/google/gs-common/ramdump/ramdump.mk
+include device/google/gs-common/ramdump_and_coredump/ramdump_and_coredump.mk
 include device/google/gs-common/soc/soc.mk
 include device/google/gs-common/modem/modem.mk
 include device/google/gs-common/aoc/aoc.mk
@@ -1143,9 +1143,6 @@ else
 BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/logger_app
 endif
 
-# sscoredump
-include hardware/google/pixel/sscoredump/device.mk
-
 # RadioExt Version
 USES_RADIOEXT_V1_6 = true
 

From b9d89f2a98c88aebb61fa5e08ee5daf0d9af4711 Mon Sep 17 00:00:00 2001
From: Chungro Lee <chungro@google.com>
Date: Mon, 11 Mar 2024 20:18:13 +0000
Subject: [PATCH 2/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
Signed-off-by: Chungro Lee <chungro@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0f9207cf5ad3b04ac4c64c844ab85c4a6803aab)
Merged-In: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64
---
 pixelstats/service.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index bb64ea62..718fb82c 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -105,6 +105,14 @@ 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",
+        "/sys/class/power_supply/maxfg_base/fg_learning_events"
+    },
+    .FGModelLoadingPath = {
+        "/sys/class/power_supply/maxfg/m5_model_state",
+        "/sys/class/power_supply/maxfg_base/m5_model_state"
+    },
     .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",
@@ -126,15 +134,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/maxfg/fg_learning_events",
-            "/sys/class/power_supply/maxfg_base/fg_learning_events"
-        },
-        .FwUpdatePath = "",
-        .FGModelLoadingPath = {
-            "/sys/class/power_supply/maxfg/m5_model_state",
-            "/sys/class/power_supply/maxfg_base/m5_model_state"
-        }
+        .FwUpdatePath = ""
 };
 
 int main() {

From e5daed552dcad3ef9d001f53e799bc7d2c0b1583 Mon Sep 17 00:00:00 2001
From: Spade Lee <spadelee@google.com>
Date: Tue, 12 Mar 2024 16:51:28 +0000
Subject: [PATCH 3/3] pixelstats: zuma: add history validation path

Bug: 329174074
Signed-off-by: Spade Lee <spadelee@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a4b4967c038aad263bc75f9248a7850355af62a1)
Merged-In: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
Change-Id: Ia134e6b6b8dc0c9db35bcf36bed700b67466f353
---
 pixelstats/service.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 718fb82c..89348a50 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -128,7 +128,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
         "/sys/devices/platform/hdcp/hdcp1_success_count",
         "/sys/devices/platform/hdcp/hdcp1_fail_count",
         "/sys/devices/platform/hdcp/hdcp0_count",
-    }
+    },
+    .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor"
 };
 
 const struct UeventListener::UeventPaths ueventPaths = {