commit d3b0191c56688054581d84efa6eea250033d6a5b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 03 12:59:51 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 03 12:59:51 2025 -0800
tree 846691764b9dfaea15761e030991e97d1ec27cb4
parent a1c1738d2427f9246b90cda76ae517d7f0206376
parent d35ef429307aa9cfa18668e6ca618b96fc9c8d6f

Merge "Add imei info in log for RIL#getImei" into main

src/java/com/android/internal/telephony/RIL.java

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 34ac832..5ff3360 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -5874,7 +5874,6 @@
             case RIL_REQUEST_GET_IMEISV:
             case RIL_REQUEST_SIM_OPEN_CHANNEL:
             case RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL:
-            case RIL_REQUEST_DEVICE_IMEI:
 
                 if (!RILJ_LOGV) {
                     // If not versbose logging just return and don't display IMSI and IMEI, IMEISV
@@ -5916,6 +5915,16 @@
             }
             sb.append("}");
             s = sb.toString();
+        } else if (req == RIL_REQUEST_DEVICE_IMEI) {
+            sb = new StringBuilder("{");
+            ImeiInfo imeiInfo = (ImeiInfo) ret;
+            if (imeiInfo != null) {
+                sb.append(Rlog.pii(RILJ_LOG_TAG, imeiInfo.imei)).append(", ");
+                sb.append(imeiInfo.type).append(", ");
+                sb.append(imeiInfo.svn);
+            }
+            sb.append("}");
+            s = sb.toString();
         } else if (req == RIL_REQUEST_GET_CURRENT_CALLS) {
             ArrayList<DriverCall> calls = (ArrayList<DriverCall>) ret;
             sb = new StringBuilder("{");