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

Commit af901105 authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Android (Google) Code Review
Browse files

Merge "[MEP] Handle java.lang.NullPointerException" into tm-dev

parents cc97221c 4daf56f3

src/java/com/android/internal/telephony/euicc/EuiccConnector.java

+3 −1
Original line number Diff line number Diff line
@@ -1053,7 +1053,9 @@ public class EuiccConnector extends StateMachine implements ServiceConnection { 
        }

        String cardIdString = UiccController.getInstance().convertToCardString(cardId);

        for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, slotInfos[slotIndex].getCardId())) {

            String retrievedCardId = slotInfos[slotIndex] != null

                    ? slotInfos[slotIndex].getCardId() : null;

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {

                return slotIndex;

            }

        }

src/java/com/android/internal/telephony/euicc/EuiccController.java

+3 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,9 @@ public class EuiccController extends IEuiccController.Stub { 
        }

        String cardIdString = UiccController.getInstance().convertToCardString(cardId);

        for (int slotIndex = 0; slotIndex < slotInfos.length; slotIndex++) {

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, slotInfos[slotIndex].getCardId())) {

            String retrievedCardId = slotInfos[slotIndex] != null

                    ? slotInfos[slotIndex].getCardId() : null;

            if (IccUtils.compareIgnoreTrailingFs(cardIdString, retrievedCardId)) {

                return slotIndex;

            }

        }