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

Commit 6815ea0b authored by Sandeep Gutta's avatar Sandeep Gutta Committed by android-build-merger
Browse files

Merge "MSIM: Consider phone count value while creating UiccSlot objects" am: b169eec9 

am: c2e2074f

Change-Id: Ic674d5731c511595f8bb6b275dfea2d593e115a7
parents 44e649c9 c2e2074f

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

+9 −2
Original line number Diff line number Diff line
@@ -145,8 +145,15 @@ public class UiccController extends Handler { 
            log("config_num_physical_slots = " + c.getResources().getInteger(

                    com.android.internal.R.integer.config_num_physical_slots));

        }

        mUiccSlots = new UiccSlot[c.getResources().getInteger(

                com.android.internal.R.integer.config_num_physical_slots)];

        int numPhysicalSlots = c.getResources().getInteger(

                com.android.internal.R.integer.config_num_physical_slots);

        // Minimum number of physical slot count should be equals to or greater than phone count,

        // if it is less than phone count use phone count as physical slot count.

        if (numPhysicalSlots < mCis.length) {

            numPhysicalSlots = mCis.length;

        }



        mUiccSlots = new UiccSlot[numPhysicalSlots];

        mPhoneIdToSlotId = new int[ci.length];

        Arrays.fill(mPhoneIdToSlotId, INVALID_SLOT_ID);

        if (VDBG) logPhoneIdToSlotIdMapping();