From 8796579a5fc20dc60ba9c20574380fe5c19b5c3c Mon Sep 17 00:00:00 2001 From: SaiChand Duppala Date: Wed, 24 Apr 2024 16:11:30 -0700 Subject: [PATCH 1/3] Disable dumpstate strict-run flag in gs101 The change disables the dumpstate strict-run flag in gs101 devices, which is enabled by default. Disabling this flag increases the timeout for capturing incident report to 120 seconds, from the default 20 seconds. This is done because 20s isn't enough to capture incident report proto in some cases, especially when device is throttling. Bug: 330400782 Test: Booted a gs101 device with the change. Then manually thermal throttled the device and captured bugreports. In some tests Incident report took a lot more more than 20s, and in all these cases it was succesfully captured. Change-Id: I8c4ee4e4412c517822776a9b10bbdad7da1c1213 --- device.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/device.mk b/device.mk index c8679f36..46a301f1 100644 --- a/device.mk +++ b/device.mk @@ -1129,3 +1129,9 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk # Touch service include device/google/gs-common/touch/twoshay/aidl_gs101.mk include device/google/gs-common/touch/twoshay/twoshay.mk + +# Allow longer timeout for incident report generation in bugreport +# Overriding in /product partition instead of /vendor intentionally, +# since it can't be overridden from /vendor. +PRODUCT_PRODUCT_PROPERTIES += \ + dumpstate.strict_run=false From 395c89ec0559a9f9b8172f3005f2ee4854f401b0 Mon Sep 17 00:00:00 2001 From: Chungro Lee Date: Tue, 12 Mar 2024 17:34:01 +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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d7a249370a93828b128cbffbab7ca9237cad90) Merged-In: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 Change-Id: I91039ce3a8ee4630a76113ef7ae6be3bc6908f64 --- 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 e4c7fd25a57a85879a2cbb518c4ec2de9e530e18 Mon Sep 17 00:00:00 2001 From: Spade Lee Date: Wed, 13 Mar 2024 02:12:02 +0000 Subject: [PATCH 3/3] pixelstats: gs101: add history validation path Bug: 329174074 Signed-off-by: Spade Lee (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d1dd07e04daf761735c95c4a2e14c108bf1dbcf1) Merged-In: I1982b772e59df66d143899086450c1e5a807f85a Change-Id: I1982b772e59df66d143899086450c1e5a807f85a --- pixelstats/service.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 5b533ceb..b83b62a3 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -78,7 +78,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { }, .FGModelLoadingPath = { "/sys/class/power_supply/maxfg/m5_model_state" - } + }, + .FGLogBufferPath = "/dev/logbuffer_maxfg_monitor" }; const struct UeventListener::UeventPaths ueventPaths = {