diff options
author | George Lee <geolee@google.com> | 2022-12-01 16:14:35 -0800 |
---|---|---|
committer | George Lee <geolee@google.com> | 2022-12-02 03:37:14 +0000 |
commit | 2a2ebf1d7821043df29240d08ea639a2f6b89d2a (patch) | |
tree | d93c7a4356df7d793b3d8b43c102e430cb06df7a | |
parent | 4a94625bce135632c99c784a9d855c64ab93837a (diff) | |
download | gs201-2a2ebf1d7821043df29240d08ea639a2f6b89d2a.tar.gz |
Battery Mitigation: Use Brownout Reason
Brownout Reason replaces startup_bugreport_requested. Battery
Mitigation needs to be updated.
Bug: 237287659
Test: Ensure lastmeal.txt is properly generated.
Merged-In: If80954497a75da0d41c8d75126e42eaae1330003
Change-Id: Ie06da78b7b9435d134c99627de53d6292def58b1
Signed-off-by: George Lee <geolee@google.com>
-rw-r--r-- | battery_mitigation/battery_mitigation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/battery_mitigation/battery_mitigation.cpp b/battery_mitigation/battery_mitigation.cpp index 2fa6721..70e8188 100644 --- a/battery_mitigation/battery_mitigation.cpp +++ b/battery_mitigation/battery_mitigation.cpp @@ -67,7 +67,7 @@ const struct MitigationConfig::Config cfg = { const char kReadyFilePath[] = "/sys/devices/virtual/pmic/mitigation/instruction/ready"; const char kReadyProperty[] = "vendor.brownout.mitigation.ready"; const char kLastMealPath[] = "/data/vendor/mitigation/lastmeal.txt"; -const char kBRRequestedProperty[] = "vendor.startup_bugreport_requested"; +const char kBRRequestedProperty[] = "vendor.brownout_reason"; const std::regex kTimestampRegex("^\\S+\\s[0-9]+:[0-9]+:[0-9]+\\S+$"); int main(int /*argc*/, char ** /*argv*/) { @@ -80,8 +80,8 @@ int main(int /*argc*/, char ** /*argv*/) { cfg.LogFilePath, cfg.TimestampFormat, kTimestampRegex); - int startupBugreport = android::base::GetIntProperty(kBRRequestedProperty, 0); - if (startupBugreport && mitigationLogTimeValid) { + std::string reason = android::base::GetProperty(kBRRequestedProperty, ""); + if (!reason.empty() && mitigationLogTimeValid) { std::ifstream src(cfg.LogFilePath, std::ios::in); std::ofstream dst(kLastMealPath, std::ios::out); dst << src.rdbuf(); |