From 54a87e5fd6ddb900ec2e649062cd07830d4e3ebd Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 10 Mar 2023 13:57:52 +0800 Subject: [PATCH] Move the rest of radio dump to gs-common Bug: 240530709 Test: adb bugreport Change-Id: Ia28ee71c84456a54d5cf824e684ae5c57c774465 --- radio/dump_radio.cpp | 16 ++++++++++++++++ radio/sepolicy/dump_radio.te | 1 + 2 files changed, 17 insertions(+) diff --git a/radio/dump_radio.cpp b/radio/dump_radio.cpp index 64d137e..8d6743c 100644 --- a/radio/dump_radio.cpp +++ b/radio/dump_radio.cpp @@ -22,7 +22,23 @@ #define RIL_LOG_NUMBER_PROPERTY "persist.vendor.ril.log.num_file" #define RIL_LOG_PREFIX "rild.log." +#define TCPDUMP_LOG_DIRECTORY "/data/vendor/tcpdump_logger/logs" +#define TCPDUMP_NUMBER_BUGREPORT "persist.vendor.tcpdump.log.br_num" +#define TCPDUMP_PERSIST_PROPERTY "persist.vendor.tcpdump.log.alwayson" +#define TCPDUMP_LOG_PREFIX "tcpdump" + int main() { + // netmgr + bool tcpdumpEnabled = ::android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false); + + if (tcpdumpEnabled) { + dumpLogs(TCPDUMP_LOG_DIRECTORY, BUGREPORT_PACKING_DIR, ::android::base::GetIntProperty(TCPDUMP_NUMBER_BUGREPORT, 5), TCPDUMP_LOG_PREFIX); + } + copyFile("/data/vendor/radio/metrics_data", "/data/vendor/radio/logs/always-on/all_logs/metrics_data"); + copyFile("/data/vendor/radio/omadm_logs.txt", "/data/vendor/radio/logs/always-on/all_logs/omadm_logs.txt"); + copyFile("/data/vendor/radio/power_anomaly_data.txt", "/data/vendor/radio/logs/always-on/all_logs/power_anomaly_data.txt"); + + // RIL dump std::string rilLogDir = ::android::base::GetProperty(RIL_LOG_DIRECTORY_PROPERTY, RIL_LOG_DIRECTORY); int maxFileNum = ::android::base::GetIntProperty(RIL_LOG_NUMBER_PROPERTY, 50); diff --git a/radio/sepolicy/dump_radio.te b/radio/sepolicy/dump_radio.te index 3fe29c9..146776c 100644 --- a/radio/sepolicy/dump_radio.te +++ b/radio/sepolicy/dump_radio.te @@ -4,4 +4,5 @@ userdebug_or_eng(` allow dump_radio radio_vendor_data_file:dir create_dir_perms; allow dump_radio radio_vendor_data_file:file create_file_perms; get_prop(dump_radio, vendor_rild_prop) + get_prop(dump_radio vendor_tcpdump_log_prop) ')