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

Commit c8582255 authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL" into mnc-dev

parents 6b9b134f 10ac1062

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

+2 −2
Original line number Diff line number Diff line
@@ -3446,8 +3446,8 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                + " 0x" + Integer.toHexString(sw2) + " "

                + s);





        return new IccIoResult(sw1, sw2, android.util.Base64.decode(s, android.util.Base64.DEFAULT));

        return new IccIoResult(sw1, sw2, (s != null)

                ? android.util.Base64.decode(s, android.util.Base64.DEFAULT) : (byte[]) null);

    }



    private Object