commit 258dbfa7678743d4bac107ab3e403b2b39ef89ea
author Nicole Lee <nicoleytlee@google.com> Mon Jun 28 20:18:10 2021 +0800
committer TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 29 05:11:30 2021 +0000
tree 5cbe10484104bbe5b3dead2c4b7c503cbc1406ff
parent 4e3b80d9fc66096b301e392035bad5d22e2a8bdf

Only stop modem logging when it is always-on logging

Bug: 192128095
Change-Id: Ic51e0c9837f1d702e6d4b58e9cb9b4a94dc9e12c

dumpstate/DumpstateDevice.cpp

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index c038c11..cb9ff85 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -963,7 +963,7 @@
     RunCommandToFd(STDOUT_FILENO, "MKDIR MODEM LOG", {"/vendor/bin/mkdir", "-p", modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
 
     bool modemLogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false);
-    if (modemLogEnabled) {
+    if (modemLogEnabled && android::base::GetProperty(MODEM_LOGGING_PATH_PROPERTY, "") == MODEM_LOG_DIRECTORY) {
         bool modemLogStarted = android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false);
         int maxFileNum = android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);