Add modem extended logging support

Bug: 110362369
Change-Id: Ie7f3b09d577004eabc1c27eae294297e4fd5a52a

2 files changed, 5 insertions, 0 deletions

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 28ad1ba2..e97c0108 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -59,6 +59,7 @@ namespace implementation {
 
 #define DIAG_LOG_PREFIX "diag_log_"
 #define TCPDUMP_LOG_PREFIX "tcpdump"
+#define EXTENDED_LOG_PREFIX "extended_log_"
 
 void DumpstateDevice::dumpLogs(int fd, std::string srcDir, std::string destDir,
                                int maxFileNum, const char *logPrefix) {
@@ -134,6 +135,7 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
 
         const std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
         const std::string tcpdumpLogDir = "/data/vendor/tcpdump_logger/logs";
+        const std::string extendedLogDir = "/data/vendor/radio/extended_logs";
         const std::vector <std::string> rilAndNetmgrLogs
             {
               "/data/vendor/radio/ril_log0",
@@ -197,6 +199,8 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
             RunCommandToFd(fd, "CP MODEM LOG", {"/vendor/bin/cp", logFile.c_str(), modemLogAllDir.c_str()}, CommandOptions::WithTimeout(2).Build());
         }
 
+        dumpLogs(fd, extendedLogDir, modemLogAllDir, 100, EXTENDED_LOG_PREFIX);
+
         android::base::SetProperty(MODEM_EFS_DUMP_PROPERTY, "false");
     }
 
diff --git a/init.logging.rc b/init.logging.rc
index 9813597f..969d5489 100644
--- a/init.logging.rc
+++ b/init.logging.rc
@@ -1,3 +1,4 @@
 on post-fs-data
     mkdir /data/vendor/modem_dump 0777 system system
     mkdir /data/vendor/radio/diag_logs/logs 0777 system system
+    mkdir /data/vendor/radio/extended_logs 0770 system radio