Evolution-x-devices/device_google_wahoo
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_wahoo synced 2026-01-30 05:29:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove QShrink database file from bugreport

Browse Source 
Bug: 37463985
Test: No qdb file in bugreport
Change-Id: If3d6cd8a580b096b8ac321151363e3d49ef3e0d4
This commit is contained in:
Jie Song
2017-04-19 11:06:14 -07:00
parent 28c5158c95
commit df248b7c4c
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dumpstate/DumpstateDevice.cpp
View File

@@ -53,11 +53,11 @@ static void getModemLogs(int fd)
}
if (!PropertiesHelper::IsUserBuild()) {
bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) && !access("/vendor/bin/smlog_dump", X_OK);
bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) &&
!access("/vendor/bin/smlog_dump", X_OK);
CommandOptions options = CommandOptions::WithTimeout(120).Build();
std::string modemLogAllDir = modemLogDir + "/modem_log";
std::string qdbFile = "/firmware/image/qdsp6m.qdb";
std::string alwaysOnLogs = "/data/vendor/radio/diag_logs/always_on";
std::vector<std::string> rilAndNetmgrLogs
{
@@ -72,16 +72,12 @@ static void getModemLogs(int fd)
if (smlogEnabled) {
RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", modemLogAllDir.c_str() }, options);
std::string copyCmd= "/system/bin/cp " + qdbFile + " " + modemLogAllDir;
RunCommandToFd(fd, "CP QDB FILE", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);
} else {
std::string copyCmd= "/system/bin/cp -rf " + alwaysOnLogs + " " + modemLogAllDir;
RunCommandToFd(fd, "CP ALWAYS ON LOGS", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);
}
// Get always on logs
std::string copyCmd= "/system/bin/cp -rf " + alwaysOnLogs + " " + modemLogAllDir;
RunCommandToFd(fd, "CP ALWAYS ON LOGS", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);
for (std::string logFile : rilAndNetmgrLogs)
for (const auto& logFile : rilAndNetmgrLogs)
{
std::string copyCmd= "/system/bin/cp " + logFile + " " + modemLogAllDir;
RunCommandToFd(fd, "CP MODEM LOG", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);