Evolution-x-devices/device_google_wahoo
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/device_google_wahoo synced 2026-02-01 07:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master

Browse Source 
Bug: 132622481
Change-Id: Ifd9c64ef9eaaf942a5556037c751090c406e05d7
This commit is contained in:
Xin Li
2019-05-13 15:54:55 -07:00
parent 5815725a91 e580748606
commit 9dae2bb79d
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
device.mk
View File

@@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \
# Set the SVN for the targeted MR release
PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.build.svn=25
ro.vendor.build.svn=26
# Enforce privapp-permissions whitelist
PRODUCT_PROPERTY_OVERRIDES += \

37
dumpstate/DumpstateDevice.cpp
View File

@@ -33,6 +33,7 @@
#define MODEM_LOG_LOC_PROPERTY "ro.radio.log_loc"
#define MODEM_LOGGING_SWITCH "persist.radio.smlog_switch"
#define DIAG_MDLOG_PERSIST_PROPERTY "persist.sys.modem.diag.mdlog"
#define DIAG_MDLOG_PROPERTY "sys.modem.diag.mdlog"
#define DIAG_MDLOG_STATUS_PROPERTY "sys.modem.diag.mdlog_on"
@@ -106,12 +107,12 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
}
if (!PropertiesHelper::IsUserBuild()) {
bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) &&
!access("/vendor/bin/smlog_dump", X_OK);
bool diagLogEnabled = android::base::GetBoolProperty(DIAG_MDLOG_PROPERTY, false);
CommandOptions options = CommandOptions::WithTimeout(120).Build();
RunCommandToFd(fd, "MODEM DIAG SYSTEM PROPERTIES",
{ "/vendor/bin/sh", "-c", "getprop", "|", "grep", "sys.modem.diag" }, options);
std::string modemLogAllDir = modemLogDir + "/modem_log";
std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
std::vector<std::string> rilAndNetmgrLogs
@@ -120,21 +121,34 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
"/data/vendor/radio/ril_log_old",
"/data/vendor/netmgr/netmgr_log",
"/data/vendor/netmgr/netmgr_log_old",
"/data/vendor/radio/power_anomaly_data.txt"
"/data/vendor/radio/power_anomaly_data.txt",
"/data/vendor/radio/diag_logs/diag_trace.txt",
"/data/vendor/radio/diag_logs/diag_trace_old.txt",
};
std::string modemLogMkDirCmd= "/vendor/bin/mkdir -p " + modemLogAllDir;
RunCommandToFd(fd, "MKDIR MODEM LOG", { "/vendor/bin/sh", "-c", modemLogMkDirCmd.c_str()}, options);
bool smlogEnabled = android::base::GetBoolProperty(MODEM_LOGGING_SWITCH, false) &&
!access("/vendor/bin/smlog_dump", X_OK);
bool diagLogEnabled = android::base::GetBoolProperty(DIAG_MDLOG_PERSIST_PROPERTY, false);
if (smlogEnabled) {
RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", modemLogAllDir.c_str() }, options);
} else if (diagLogEnabled) {
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
bool diagLogStarted = android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false);
if (diagLogStarted) {
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
ALOGD("Stopping diag_mdlog...\n");
} else {
ALOGD("diag_mdlog is not running\n");
}
ALOGD("Waiting for diag log to exit\n");
for (int i = 0; i < 30; i++) {
if (!android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false)) {
ALOGD("diag log exited\n");
ALOGD("diag_mdlog exited\n");
sleep(1);
break;
}
@@ -144,13 +158,16 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
dumpDiagLogs(fd, diagLogDir, modemLogAllDir);
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
if (diagLogStarted) {
ALOGD("Restarting diag_mdlog...\n");
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
}
}
for (const auto& logFile : rilAndNetmgrLogs)
{
std::string copyCmd= "/vendor/bin/cp " + logFile + " " + modemLogAllDir;
RunCommandToFd(fd, "CP MODEM LOG", { "/vendor/bin/sh", "-c", copyCmd.c_str()}, options);
RunCommandToFd(fd, "CP MODEM LOG", { "/vendor/bin/sh", "-c", copyCmd.c_str() }, options);
}
std::string filePrefix = android::base::GetProperty(MODEM_LOG_PREFIX_PROPERTY, "");