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

Adding init script and SELinux support for qlogd

Browse Source 
Bug: 37115787
Change-Id: I64988953513cd0a7c2e861b5cad5fa6c1c7b9557
This commit is contained in:
Jie Song
2017-05-10 09:27:57 -07:00
parent 78cc5b001c
commit 18aecb7cb8
7 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dumpstate/DumpstateDevice.cpp
View File

@@ -31,6 +31,9 @@
#define MODEM_LOG_LOC_PROPERTY "ro.radio.log_loc"
#define MODEM_LOGGING_SWITCH "persist.radio.smlog_switch"
#define DIAG_MDLOG_PROPERTY "persist.sys.modem.diag.mdlog"
#define DIAG_MDLOG_STATUS_PROPERTY "sys.modem.diag.mdlog"
using android::os::dumpstate::CommandOptions;
using android::os::dumpstate::DumpFileToFd;
using android::os::dumpstate::PropertiesHelper;
@@ -56,9 +59,11 @@ static void getModemLogs(int fd)
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();
std::string modemLogAllDir = modemLogDir + "/modem_log";
std::string alwaysOnLogs = "/data/vendor/radio/diag_logs/always_on";
std::string diagLogDir = "/data/vendor/radio/diag_logs/logs";
std::vector<std::string> rilAndNetmgrLogs
{
"/data/misc/radio/ril_log",
@@ -72,9 +77,24 @@ static void getModemLogs(int fd)
if (smlogEnabled) {
RunCommandToFd(fd, "SMLOG DUMP", { "smlog_dump", "-d", "-o", modemLogAllDir.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);
} else if (diagLogEnabled) {
std::string copyCmd= "/system/bin/cp -rf " + diagLogDir + " " + modemLogAllDir;
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false");
ALOGD("Waiting for diag log to exit\n");
for (int i = 0; i < 10; i++) {
if (!android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false)) {
ALOGD("diag log exited\n");
break;
}
sleep(1);
}
RunCommandToFd(fd, "CP DIAG LOGS", { "/system/bin/sh", "-c", copyCmd.c_str()}, options);
android::base::SetProperty(DIAG_MDLOG_PROPERTY, "true");
}
for (const auto& logFile : rilAndNetmgrLogs)