commit 2148f02c08aecbe70995f32881795cadcf828aa8
author Nicole Lee <nicoleytlee@google.com> Tue Jun 01 22:10:59 2021 +0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 07 02:14:16 2021 +0000
tree 0ff401b3d50b433a2c031f2b10e082d2ff801357
parent 6181c3ef5ecf6014669f256ae9cd7f379ea88ea6

dumpstate: stop modem always-on logging only

Dumpstate will only collect always-on modem logs,
should only stop modem logging when it is always-on

Bug: 189441741
Change-Id: Icc4e1940aab774d56e51e966248985dda539890c

dumpstate/DumpstateDevice.cpp

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index adc9d5a..f2b1e2b 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -39,6 +39,7 @@
 #define MODEM_LOGGING_PROPERTY "vendor.sys.modem.logging.enable"
 #define MODEM_LOGGING_STATUS_PROPERTY "vendor.sys.modem.logging.status"
 #define MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY "persist.vendor.sys.modem.logging.br_num"
+#define MODEM_LOGGING_PATH_PROPERTY "vendor.sys.modem.logging.log_path"
 #define GPS_LOG_DIRECTORY "/data/vendor/gps/logs"
 #define GPS_LOG_NUMBER_PROPERTY "persist.vendor.gps.aol.log_num"
 #define GPS_LOGGING_STATUS_PROPERTY "vendor.gps.aol.enabled"
@@ -943,8 +944,10 @@
             bool modemLogStarted = android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false);
 
             if (modemLogStarted) {
-                android::base::SetProperty(MODEM_LOGGING_PROPERTY, "false");
-                ALOGD("Stopping modem logging...\n");
+                if (android::base::GetProperty(MODEM_LOGGING_PATH_PROPERTY, "") == MODEM_LOG_DIRECTORY) {
+                    android::base::SetProperty(MODEM_LOGGING_PROPERTY, "false");
+                    ALOGD("Stopping modem logging...\n");
+                }
             } else {
                 ALOGD("modem logging is not running\n");
             }