From b29da9d49229551d41ea6b3fb5054ec3b153f8c3 Mon Sep 17 00:00:00 2001 From: Jie Song Date: Fri, 16 Jun 2017 18:18:11 -0700 Subject: [PATCH] Increase stop timer for modem logging 1. sys.modem.diag.mdlog to start/stop for this boot 2. sys.modem.diag.mdlog_on for status 3. Increase timer of stop logging Bug: 62489031 Test: Verify with Pixel Logger and Bugreport Change-Id: I02a230ad29d23c4a302660ceeb7764ccfcba7cc8 --- dumpstate/DumpstateDevice.cpp | 7 ++++--- init.hardware.diag.rc.userdebug | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index f0ced8ad..5b17030d 100755 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -31,8 +31,8 @@ #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" +#define DIAG_MDLOG_PROPERTY "sys.modem.diag.mdlog" +#define DIAG_MDLOG_STATUS_PROPERTY "sys.modem.diag.mdlog_on" using android::os::dumpstate::CommandOptions; using android::os::dumpstate::DumpFileToFd; @@ -83,9 +83,10 @@ static void getModemLogs(int fd) android::base::SetProperty(DIAG_MDLOG_PROPERTY, "false"); ALOGD("Waiting for diag log to exit\n"); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 30; i++) { if (!android::base::GetBoolProperty(DIAG_MDLOG_STATUS_PROPERTY, false)) { ALOGD("diag log exited\n"); + sleep(1); break; } diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug index c1398216..e4f458e7 100644 --- a/init.hardware.diag.rc.userdebug +++ b/init.hardware.diag.rc.userdebug @@ -41,6 +41,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag && property:sys. on property:sys.usb.config=diag,adb && property:sys.usb.configfs=1 start adbd + on property:sys.usb.ffs.ready=1 && property:sys.usb.config=diag,adb && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_adb" rm /config/usb_gadget/g1/configs/b.1/f1 @@ -347,10 +348,13 @@ service diag_mdlog_stop /vendor/bin/diag_mdlog -k disabled oneshot -on property:persist.sys.modem.diag.mdlog=true +on boot && property:persist.sys.modem.diag.mdlog=* + setprop sys.modem.diag.mdlog ${persist.sys.modem.diag.mdlog} + +on property:sys.modem.diag.mdlog=true start diag_mdlog_start -on property:persist.sys.modem.diag.mdlog=false +on property:sys.modem.diag.mdlog=false start diag_mdlog_stop on property:persist.sys.cnss.diag_qxdm=true