From d9a48832b9ac296269b4e6af4c6551b34ced5b74 Mon Sep 17 00:00:00 2001 From: Jie Song Date: Wed, 31 Jan 2018 14:18:00 -0800 Subject: [PATCH 1/4] Collect mdlog trace and status in Bugreport Bug: 72712518 Change-Id: Id6701ddc4fde18bade8acd6cbada1b116ee6455d (cherry picked from commit 0878ca9d7984e11eed4e0c817e0b648a63e04d50) --- dumpstate/DumpstateDevice.cpp | 37 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index f676ad89..929e4348 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -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 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, ""); From e7f2d197b5e67cc7e43fa578224c7ece0a6fa43c Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Mon, 11 Mar 2019 11:09:29 -0700 Subject: [PATCH 2/4] [DO NOT MERGE] Update Wahoo SVN to 26 in pi-dev Bug: 128322951 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 45c60fff..4f549c1b 100755 --- a/device.mk +++ b/device.mk @@ -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 += \ From 9424dc7bc50693498f0e418dceb49abac3af03f2 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 12 Apr 2019 12:00:25 -0700 Subject: [PATCH 3/4] [DO NOT MERGE] Update Wahoo SVN to 27 Bug:129374896 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 4f549c1b..ee3a5bbf 100755 --- a/device.mk +++ b/device.mk @@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \ From 927430f260d7b9dc62759d3e90e13d41f5562651 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 13 May 2019 15:43:06 -0700 Subject: [PATCH 4/4] [DO NOT MERGE] Update Wahoo SVN to 28 Bug:132634503 (cherry picked from commit 934ba6d5527c32f85a4efa9745626e4080ffeac8) Change-Id: I342944708a569ccad9c72cca498f384be224154e --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index ee3a5bbf..11d17f6e 100755 --- a/device.mk +++ b/device.mk @@ -36,7 +36,7 @@ PRODUCT_COPY_FILES += \ # Set the SVN for the targeted MR release PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=27 + ro.vendor.build.svn=28 # Enforce privapp-permissions whitelist PRODUCT_PROPERTY_OVERRIDES += \