From 242debae75d823e9d359f43174b95326c31c384d Mon Sep 17 00:00:00 2001
From: kierancyphus <kierancyphus@google.com>
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
Merged-In: I1a57e0f4fea66929803fac350547b706d7442b26
---
 dumpstate/DumpstateDevice.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 2f6f1b75..f3910326 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -33,7 +33,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"
@@ -1085,7 +1085,7 @@ void DumpstateDevice::dumpModemSection(int fd) {
 static void *dumpModemThread(void *data) {
     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";
 
@@ -1148,7 +1148,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);