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

Commit 596794bc authored by Yoshiaki Naka's avatar Yoshiaki Naka
Browse files

Avoid ArrayIndexOutOfBoundsException thrown because of unexpected slot 

Actually it is not expected to receive many slot information from the
underlying implementation than expected. However, just making
mUiccSlots[] throw ArrayIndexOutOfBoundsException is also not good.
It is better to check the propagated slot information and put error log.

Bug: 143918247
Test: Confirmed that unexpected slot does not cause the exception.

Change-Id: I003bacfa442dd2da878f4082218e63e561bbb75c
parent 6e733756

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

+12 −2
Original line number Diff line number Diff line
@@ -830,7 +830,17 @@ public class UiccController extends Handler { 
        boolean isDefaultEuiccCardIdSet = false;

        boolean anyEuiccIsActive = false;

        mHasActiveBuiltInEuicc = false;

        for (int i = 0; i < status.size(); i++) {



        int numSlots = status.size();

        if (mUiccSlots.length < numSlots) {

            String logStr = "The number of the physical slots reported " + numSlots

                    + " is greater than the expectation " + mUiccSlots.length + ".";

            Rlog.e(LOG_TAG, logStr);

            sLocalLog.log(logStr);

            numSlots = mUiccSlots.length;

        }



        for (int i = 0; i < numSlots; i++) {

            IccSlotStatus iss = status.get(i);

            boolean isActive = (iss.slotState == IccSlotStatus.SlotState.SLOTSTATE_ACTIVE);

            if (isActive) {
@@ -895,7 +905,7 @@ public class UiccController extends Handler { 
            // Note that on HAL<1.2, it's possible that a built-in eUICC exists, but does not

            // correspond to any slot in mUiccSlots. This logic is still safe in that case because

            // SlotStatus is only for HAL >= 1.2

            for (int i = 0; i < status.size(); i++) {

            for (int i = 0; i < numSlots; i++) {

                if (mUiccSlots[i].isEuicc()) {

                    String eid = status.get(i).eid;

                    if (!TextUtils.isEmpty(eid)) {