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

Commit 4daf56f3 authored by Muralidhar Reddy's avatar Muralidhar Reddy Committed by Muralidhar Reddy Mule
Browse files

[MEP] Handle java.lang.NullPointerException 

The objects in the getUiccSlotsInfo return array can be null if the slot info is not available. It is possible in two cases
1. Slots info is no proper due to modem is in bad state
2. API is called between phone process starting and getting slot info from modem.

Bug: 227795919
Test: Manually tested esim scenarios on C10 device (Download, Enable, Disable & Delete profile) and atest FrameworksTelephonyTests
Change-Id: I031d0b2de6b98053d3f01a2284d43dd41081bfce
parent 8dee0d55

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;

            }

        }