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

Commit d0943127 authored by Sandeep Gutta's avatar Sandeep Gutta Committed by android-build-merger
Browse files

Merge "Add sanity check to fix NullPointerException" 

am: 95be6f1a

Change-Id: I30e8411fcd8143b4239ca6c6e523de42ff0bef03
parents 04214a63 95be6f1a

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

+10 −1
Original line number Diff line number Diff line
@@ -342,7 +342,16 @@ public class SubscriptionInfoUpdater extends Handler { 


        String iccId = mIccId[slotId];

        if (iccId == null) {

            IccRecords records = mPhone[slotId].getIccCard().getIccRecords();

            IccCard iccCard = mPhone[slotId].getIccCard();

            if (iccCard == null) {

                logd("handleSimLoaded: IccCard null");

                return;

            }

            IccRecords records = iccCard.getIccRecords();

            if (records == null) {

                logd("handleSimLoaded: IccRecords null");

                return;

            }

            if (IccUtils.stripTrailingFs(records.getFullIccId()) == null) {

                logd("handleSimLocked: IccID null");

                return;