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

Unverified Commit 683b3cd4 authored by Christian Hoffmann's avatar Christian Hoffmann Committed by Michael Bestas
Browse files

Fix NPE with 1.0 and 1.1 CardStatus 

Change-Id: I965f6ef419b7aef828da02f5d4745bd33d09fe3a
parent 10d3c867

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

+2 −0
Original line number Diff line number Diff line
@@ -1879,6 +1879,8 @@ public class RadioResponse extends IRadioResponse.Stub { 


        if (rr != null) {

            IccCardStatus iccCardStatus = RILUtils.convertHalCardStatus(cardStatus);

            IccSlotPortMapping slotPortMapping = new IccSlotPortMapping();

            iccCardStatus.mSlotPortMapping = slotPortMapping;

            mRil.riljLog("responseIccCardStatus: from HIDL: " + iccCardStatus);

            if (responseInfo.error == RadioError.NONE) {

                sendMessageResponse(rr.mResult, iccCardStatus);