gps: Add MCU crash dump to bugreport am: f943e9a4f3

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/17230856

Change-Id: Ibdf754efcf43f0eb66c0eddcb06b3b45caf43db4
This commit is contained in:
Shinru Han 2022-03-18 03:40:02 +00:00 committed by Automerger Merge Worker
commit 41b26a1666
3 changed files with 12 additions and 6 deletions

View file

@ -63,6 +63,7 @@ namespace V1_1 {
namespace implementation { namespace implementation {
#define GPS_LOG_PREFIX "gl-" #define GPS_LOG_PREFIX "gl-"
#define GPS_MCU_LOG_PREFIX "esw-"
#define MODEM_LOG_PREFIX "sbuff_" #define MODEM_LOG_PREFIX "sbuff_"
#define EXTENDED_LOG_PREFIX "extended_log_" #define EXTENDED_LOG_PREFIX "extended_log_"
#define RIL_LOG_PREFIX "rild.log." #define RIL_LOG_PREFIX "rild.log."
@ -190,13 +191,18 @@ void dumpModemEFS(std::string destDir) {
} }
} }
void DumpstateDevice::dumpGpsLogs(int fd, std::string destDir) { void DumpstateDevice::dumpGpsLogs(int fd, const std::string &destDir) {
const std::string gpsLogDir = GPS_LOG_DIRECTORY; const std::string gpsLogDir = GPS_LOG_DIRECTORY;
const std::string gpsTmpLogDir = gpsLogDir + "/.tmp"; const std::string gpsTmpLogDir = gpsLogDir + "/.tmp";
int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 30); const std::string gpsDestDir = destDir + "/gps";
int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 20);
dumpLogs(fd, gpsTmpLogDir, destDir, 1, GPS_LOG_PREFIX); RunCommandToFd(fd, "MKDIR GPS LOG", {"/vendor/bin/mkdir", "-p", gpsDestDir.c_str()},
dumpLogs(fd, gpsLogDir, destDir, maxFileNum, GPS_LOG_PREFIX); 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);
} }
void DumpstateDevice::dumpCameraLogs(int fd, const std::string &destDir) { void DumpstateDevice::dumpCameraLogs(int fd, const std::string &destDir) {

View file

@ -84,7 +84,7 @@ struct DumpstateDevice : public IDumpstateDevice {
// Hybrid and binary sections that require an additional file descriptor // Hybrid and binary sections that require an additional file descriptor
void dumpModem(int fd, int fdModem); void dumpModem(int fd, int fdModem);
void dumpRilLogs(int fd, std::string destDir); void dumpRilLogs(int fd, std::string destDir);
void dumpGpsLogs(int fd, std::string destDir); void dumpGpsLogs(int fd, const std::string &destDir);
void dumpCameraLogs(int fd, const std::string &destDir); void dumpCameraLogs(int fd, const std::string &destDir);
}; };

View file

@ -17,7 +17,7 @@ LheBbdControl=/dev/bbd_control
# LheBbdSensor=/dev/bbd_sensor # LheBbdSensor=/dev/bbd_sensor
LheFailSafe=/data/vendor/gps/esw-crash-dump.txt LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
LogLevel=*:I LogLevel=*:I
NvStorageDir=/data/vendor/gps/ NvStorageDir=/data/vendor/gps/