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

Commit 864375d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE at at UiccController.java:1028"

parents 92250a64 5e874123

src/java/com/android/internal/telephony/uicc/UiccController.java

+3 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,9 @@ public class UiccController extends Handler { 
                boolean defaultEuiccCardIdIsStillInserted = false;

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                for (UiccSlot slot : mUiccSlots) {

                    if (slot.getUiccCard() == null) {

                        continue;

                    }

                    if (cardString.equals(

                            IccUtils.stripTrailingFs(slot.getUiccCard().getCardId()))) {

                        defaultEuiccCardIdIsStillInserted = true;