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

Commit 95be6f1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add sanity check to fix NullPointerException"

parents d8a7436f d01a100a
Loading
Loading
Loading
Loading
+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;