Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e6d7f5a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add imei info in log for RIL#getImei" into main am: d3b0191c am: b696b083 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3139133



Change-Id: I6782c6e82c58b08cfd9d29bb22c96b76807d5684
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67ed663e b696b083

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

+10 −1
Original line number Diff line number Diff line
@@ -6011,7 +6011,6 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            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
@@ -6053,6 +6052,16 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            }

            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("{");