From bffe8fccb9f9a0e831ab30653ef0901fbf4c8e0f Mon Sep 17 00:00:00 2001 From: kierancyphus Date: Mon, 5 Dec 2022 14:04:45 +0800 Subject: [PATCH] Dumpstate: 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: Id87f381a4895399a035ea4fe55d132e31d5d796c --- dumpstate/Dumpstate.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dumpstate/Dumpstate.cpp b/dumpstate/Dumpstate.cpp index 4fdcc10f..066cf0c3 100644 --- a/dumpstate/Dumpstate.cpp +++ b/dumpstate/Dumpstate.cpp @@ -32,7 +32,7 @@ #include "DumpstateUtil.h" #define MODEM_LOG_DIRECTORY "/data/vendor/radio/logs/always-on" -#define MODEM_LOG_MASK_HISTORY_DIRECTORY "/data/vendor/radio/logs/mask_history" +#define MODEM_LOG_HISTORY_DIRECTORY "data/vendor/radio/logs/history" #define MODEM_EXTENDED_LOG_DIRECTORY "/data/vendor/radio/extended_logs" #define RIL_LOG_DIRECTORY "/data/vendor/radio" #define RIL_LOG_DIRECTORY_PROPERTY "persist.vendor.ril.log.base_dir" @@ -622,10 +622,10 @@ void Dumpstate::dumpLEDSection(int fd) { void Dumpstate::dumpModemLogs(int fd, const std::string &destDir) { std::string extendedLogDir = MODEM_EXTENDED_LOG_DIRECTORY; - std::string modemLogMaskHistoryDir = MODEM_LOG_MASK_HISTORY_DIRECTORY; + std::string modemLogHistoryDir = MODEM_LOG_HISTORY_DIRECTORY; dumpLogs(fd, extendedLogDir, destDir, 20, EXTENDED_LOG_PREFIX); - dumpLogs(fd, modemLogMaskHistoryDir, destDir, 1, "LoggingMask"); + dumpLogs(fd, modemLogHistoryDir, destDir, 2, "Logging"); dumpModemEFS(destDir); }