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

Commit 7a8e1efb authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Add sanity check to avoid NullPointerException." am: df844ef5 am: 5688d2e9 

am: bca1f779

Change-Id: I5c759c0f623aaf702103631ed3f762a0246f17e1
parents ad28837f bca1f779

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

+6 −1
Original line number Diff line number Diff line
@@ -384,7 +384,12 @@ public class SubscriptionInfoUpdater extends Handler { 
        // removed or a refresh RESET that the IccRecords could be null. The right behavior is to

        // not broadcast the SIM loaded.

        int loadedSlotId = slotId;

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

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

        if (iccCard == null) {  // Possibly a race condition.

            logd("handleSimLoaded: IccCard null");

            return;

        }

        IccRecords records = iccCard.getIccRecords();

        if (records == null) {  // Possibly a race condition.

            logd("handleSimLoaded: IccRecords null");

            return;