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

Commit ca33bf35 authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

Merge "Change log for imei in RIL_REQUEST_DEVICE_IDENTITY" am: 8792c505 am: 8b3add71 

am: 9b2646b9

Change-Id: Iacaade23da060ade0b9a37622f1603fee2b31407
parents 4fc3c010 9b2646b9

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

+6 −1
Original line number Diff line number Diff line
@@ -5110,7 +5110,12 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            sb = new StringBuilder("{");

            if (length > 0) {

                int i = 0;

                // position 0 is IMEI in RIL_REQUEST_DEVICE_IDENTITY

                if (req == RIL_REQUEST_DEVICE_IDENTITY) {

                    sb.append(Rlog.pii(RILJ_LOG_TAG, strings[i++]));

                } else {

                    sb.append(strings[i++]);

                }

                while (i < length) {

                    sb.append(", ").append(strings[i++]);

                }