Evolution-X-Tensor/device_google_gs-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "move modem operation to dump_modemlog" into udc-dev am: 1d9d2b9c79

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/21780674

Change-Id: Ied3157b078e0b3bd2b054f366844f9376a296f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Adam Shih 2023-03-13 02:41:34 +00:00 • committed by Automerger Merge Worker
commit 0c1d5509c7
3 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modem/Android.bp
View file

@ -18,7 +18,9 @@ cc_binary {
"-Werror", "-Werror",
], ],
shared_libs: [ shared_libs: [
"libbase",
"libdump", "libdump",
"liblog",
], ],
vendor: true, vendor: true,
relative_install_path: "dump", relative_install_path: "dump",

40
modem/dump_modemlog.cpp
View file

@ -14,9 +14,47 @@
* limitations under the License. * limitations under the License.
*/ */
#include <dump/pixel_dump.h> #include <dump/pixel_dump.h>
#include <android-base/properties.h>
#include <log/log.h>
#define MODEM_LOGGING_PERSIST_PROPERTY "persist.vendor.sys.modem.logging.enable"
#define MODEM_LOGGING_PROPERTY "vendor.sys.modem.logging.enable"
#define MODEM_LOGGING_STATUS_PROPERTY "vendor.sys.modem.logging.status"
#define MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY "persist.vendor.sys.modem.logging.br_num"
#define MODEM_LOGGING_PATH_PROPERTY "vendor.sys.modem.logging.log_path"
#define MODEM_LOG_PREFIX "sbuff_"
int main() { int main() {
dumpLogs("/data/vendor/radio/extended_logs", "/data/vendor/radio/logs/always-on/all_logs", 20, "extended_log_"); bool modemLogEnabled = ::android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false);
if (modemLogEnabled && ::android::base::GetProperty(MODEM_LOGGING_PATH_PROPERTY, "") == MODEM_LOG_DIRECTORY) {
bool modemLogStarted = ::android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false);
int maxFileNum = ::android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);
if (modemLogStarted) {
::android::base::SetProperty(MODEM_LOGGING_PROPERTY, "false");
ALOGD("Stopping modem logging...\n");
} else {
ALOGD("modem logging is not running\n");
}
for (int i = 0; i < 15; i++) {
if (!::android::base::GetBoolProperty(MODEM_LOGGING_STATUS_PROPERTY, false)) {
ALOGD("modem logging stopped\n");
sleep(1);
break;
}
sleep(1);
}
dumpLogs(MODEM_LOG_DIRECTORY, BUGREPORT_PACKING_DIR, maxFileNum, MODEM_LOG_PREFIX);
if (modemLogStarted) {
ALOGD("Restarting modem logging...\n");
::android::base::SetProperty(MODEM_LOGGING_PROPERTY, "true");
}
}
dumpLogs("/data/vendor/radio/extended_logs", BUGREPORT_PACKING_DIR, 20, "extended_log_");
copyFile("/mnt/vendor/efs/nv_normal.bin", "/data/vendor/radio/logs/always-on/all_logs/nv_normal.bin"); copyFile("/mnt/vendor/efs/nv_normal.bin", "/data/vendor/radio/logs/always-on/all_logs/nv_normal.bin");
copyFile("/mnt/vendor/efs/nv_protected.bin", "/data/vendor/radio/logs/always-on/all_logs/nv_protected.bin"); copyFile("/mnt/vendor/efs/nv_protected.bin", "/data/vendor/radio/logs/always-on/all_logs/nv_protected.bin");
return 0; return 0;

3
modem/sepolicy/dump_modemlog.te
View file

@ -4,6 +4,9 @@ userdebug_or_eng(`
allow dump_modemlog mnt_vendor_file:dir search; allow dump_modemlog mnt_vendor_file:dir search;
allow dump_modemlog modem_efs_file:dir search; allow dump_modemlog modem_efs_file:dir search;
allow dump_modemlog modem_efs_file:file r_file_perms; allow dump_modemlog modem_efs_file:file r_file_perms;
allow dump_modemlog vendor_slog_file:dir r_dir_perms;
allow dump_modemlog vendor_slog_file:file r_file_perms;
allow dump_modemlog radio_vendor_data_file:dir create_dir_perms; allow dump_modemlog radio_vendor_data_file:dir create_dir_perms;
allow dump_modemlog radio_vendor_data_file:file create_file_perms; allow dump_modemlog radio_vendor_data_file:file create_file_perms;
set_prop(dump_modemlog, vendor_modem_prop)
') ')