From d8908905aad1a898ddb94fda70af09e156ddfe41 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Thu, 27 May 2021 20:11:08 +0800 Subject: [PATCH] gps: Add MCU crash dump in bugreport Bug: 189288775 Test: on device Change-Id: I0d3d1fdb6410098779d5ff9ed5d8b9bc7a347764 --- dumpstate/DumpstateDevice.cpp | 10 ++++++++-- gnss/47765/config/lhd2.conf | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 9c259afe..2d34941c 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -63,6 +63,7 @@ namespace V1_1 { namespace implementation { #define GPS_LOG_PREFIX "gl-" +#define GPS_MCU_LOG_PREFIX "esw-" #define MODEM_LOG_PREFIX "sbuff_" #define EXTENDED_LOG_PREFIX "extended_log_" #define RIL_LOG_PREFIX "rild.log." @@ -193,10 +194,15 @@ void dumpModemEFS(std::string destDir) { void DumpstateDevice::dumpGpsLogs(int fd, std::string destDir) { const std::string gpsLogDir = GPS_LOG_DIRECTORY; const std::string gpsTmpLogDir = gpsLogDir + "/.tmp"; + const std::string gpsDestDir = destDir + "/gps"; int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 30); - dumpLogs(fd, gpsTmpLogDir, destDir, 1, GPS_LOG_PREFIX); - dumpLogs(fd, gpsLogDir, destDir, maxFileNum, GPS_LOG_PREFIX); + RunCommandToFd(fd, "MKDIR GPS LOG", {"/vendor/bin/mkdir", "-p", gpsDestDir.c_str()}, + CommandOptions::WithTimeout(2).Build()); + + dumpLogs(fd, gpsTmpLogDir, gpsDestDir, 1, GPS_LOG_PREFIX); + dumpLogs(fd, gpsLogDir, gpsDestDir, 3, GPS_MCU_LOG_PREFIX); + dumpLogs(fd, gpsLogDir, gpsDestDir, maxFileNum, GPS_LOG_PREFIX); } timepoint_t startSection(int fd, const std::string §ionName) { diff --git a/gnss/47765/config/lhd2.conf b/gnss/47765/config/lhd2.conf index c075cb7e..77212c45 100644 --- a/gnss/47765/config/lhd2.conf +++ b/gnss/47765/config/lhd2.conf @@ -1,5 +1,5 @@ LheConsole=/data/vendor/gps/LheConsole LogEnabled=true Log=JAVA -LheFailSafe=/data/vendor/gps/esw-crash-dump.txt +LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt