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

Commit 5a5cd156 authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge "Log when PUK is empty" am: f832dd72 am: 8a0fd64e am: ce20722f 

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

Change-Id: Id20e1134cef91df6e0b535afb5dfd6712ced6a8a
parents c98c41fd ce20722f

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

+3 −1
Original line number Diff line number Diff line
@@ -830,14 +830,16 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            RILRequest rr = obtainRequest(RIL_REQUEST_ENTER_SIM_PUK, result,

                    mRILDefaultWorkSource);



            String pukStr = convertNullToEmptyString(puk);

            if (RILJ_LOGD) {

                riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)

                        + " isPukEmpty = " + pukStr.isEmpty()

                        + " aid = " + aid);

            }



            try {

                radioProxy.supplyIccPukForApp(rr.mSerial,

                        convertNullToEmptyString(puk),

                        pukStr,

                        convertNullToEmptyString(newPin),

                        convertNullToEmptyString(aid));

            } catch (RemoteException | RuntimeException e) {