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
This commit is contained in:
kierancyphus 2022-12-01 17:20:45 +08:00 committed by Kieran Cyphus
parent 09383c4690
commit 242debae75

View file

@ -33,7 +33,7 @@
#define MODEM_LOG_DIRECTORY "/data/vendor/radio/logs/always-on" #define MODEM_LOG_DIRECTORY "/data/vendor/radio/logs/always-on"
#define MODEM_EXTENDED_LOG_DIRECTORY "/data/vendor/radio/extended_logs" #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 "/data/vendor/radio"
#define RIL_LOG_DIRECTORY_PROPERTY "persist.vendor.ril.log.base_dir" #define RIL_LOG_DIRECTORY_PROPERTY "persist.vendor.ril.log.base_dir"
#define RIL_LOG_NUMBER_PROPERTY "persist.vendor.ril.log.num_file" #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) { static void *dumpModemThread(void *data) {
std::string modemLogDir = MODEM_LOG_DIRECTORY; std::string modemLogDir = MODEM_LOG_DIRECTORY;
std::string extendedLogDir = MODEM_EXTENDED_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; std::string tcpdumpLogDir = TCPDUMP_LOG_DIRECTORY;
static const std::string sectionName = "modem"; 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, extendedLogDir, modemLogAllDir, 50, EXTENDED_LOG_PREFIX);
dumpLogs(STDOUT_FILENO, modemLogMaskHistoryDir, modemLogAllDir, 1, "LoggingMask"); dumpLogs(STDOUT_FILENO, modemLogHistoryDir, modemLogAllDir, 2, "Logging");
dumpRilLogs(STDOUT_FILENO, modemLogAllDir); dumpRilLogs(STDOUT_FILENO, modemLogAllDir);
dumpNetmgrLogs(modemLogAllDir); dumpNetmgrLogs(modemLogAllDir);
dumpModemEFS(modemLogAllDir); dumpModemEFS(modemLogAllDir);