Merge "dumpstate: Add radio/sim folder to bugreport" into udc-dev am: 9626187645

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

Change-Id: I61142cbc6810c9d3b8d9f6b0b1ccfb96ee004514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/modem/dump_modemlog.cpp b/modem/dump_modemlog.cpp
index 5aaa554..f7ef834 100644
--- a/modem/dump_modemlog.cpp
+++ b/modem/dump_modemlog.cpp
@@ -22,7 +22,9 @@
 #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_SIM_DIRECTORY "/data/vendor/radio/sim/"
 #define MODEM_LOG_PREFIX "sbuff_"
+#define SIM_POWERON_LOG_PREFIX "sim_poweron_log_"
 
 int main() {
     bool modemLogEnabled = ::android::base::GetBoolProperty(MODEM_LOGGING_PERSIST_PROPERTY, false);
@@ -55,6 +57,7 @@
     }
 
     dumpLogs("/data/vendor/radio/extended_logs", BUGREPORT_PACKING_DIR, 20, "extended_log_");
+    dumpLogs(MODEM_SIM_DIRECTORY, BUGREPORT_PACKING_DIR, 1, SIM_POWERON_LOG_PREFIX);
     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");
     return 0;