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

Commit 0999bf19 authored by SongFerngWang's avatar SongFerngWang Committed by Automerger Merge Worker
Browse files

Fix NPE at at UiccController.java:1028 am: 2486187c 

Change-Id: I558c80e4816c8a681d8699d3e39e499284bec4fa
parents 5dcf8741 2486187c

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

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

                boolean defaultEuiccCardIdIsStillInserted = false;

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                String cardString = mCardStrings.get(mDefaultEuiccCardId);

                for (UiccSlot slot : mUiccSlots) {

                for (UiccSlot slot : mUiccSlots) {

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

                        continue;

                    }

                    if (cardString.equals(

                    if (cardString.equals(

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

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

                        defaultEuiccCardIdIsStillInserted = true;

                        defaultEuiccCardIdIsStillInserted = true;