From a381b21dfc846816ac5a11c20f15251ed792cdaf Mon Sep 17 00:00:00 2001 From: kierancyphus Date: Thu, 1 Dec 2022 17:20:45 +0800 Subject: [PATCH] Dumpstate.cpp: use new history dir and inc more files Modify the logging mask file path to instead point to the new history directory, as well as include more files (right now only logging mask history and logging enabled history). Bug: 259174982 Test: Manually build and inspect bugreport to make sure files are included Change-Id: I1a57e0f4fea66929803fac350547b706d7442b26 --- dumpstate/Dumpstate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 11142f5f..9be29e84 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -34,7 +34,7 @@ #define MODEM_LOG_DIRECTORY "/data/vendor/radio/logs/always-on" #define MODEM_EXTENDED_LOG_DIRECTORY "/data/vendor/radio/extended_logs" -#define MODEM_LOG_MASK_HISTORY_DIRECTORY "/data/vendor/radio/logs/mask_history" +#define MODEM_LOG_HISTORY_DIRECTORY "/data/vendor/radio/logs/history" #define RIL_LOG_DIRECTORY "/data/vendor/radio" #define RIL_LOG_DIRECTORY_PROPERTY "persist.vendor.ril.log.base_dir" #define RIL_LOG_NUMBER_PROPERTY "persist.vendor.ril.log.num_file" @@ -617,7 +617,7 @@ static void *dumpModemThread(void *data) { ATRACE_ASYNC_BEGIN("dumpModemThread", 0); std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; - std::string modemLogMaskHistoryDir = MODEM_LOG_MASK_HISTORY_DIRECTORY; + std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY; std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY; static const std::string sectionName = "modem"; @@ -680,7 +680,7 @@ static void *dumpModemThread(void *data) { } dumpLogs(STDOUT_FILENO, extendedLogDir, modemLogAllDir, 50, EXTENDED_LOG_PREFIX); - dumpLogs(STDOUT_FILENO, modemLogMaskHistoryDir, modemLogAllDir, 1, "LoggingMask"); + dumpLogs(STDOUT_FILENO, modemLogHistoryDir, modemLogAllDir, 2, "Logging"); dumpRilLogs(STDOUT_FILENO, modemLogAllDir); dumpNetmgrLogs(modemLogAllDir); dumpModemEFS(modemLogAllDir);