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

Commit bb1a5b4e authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Initialize new mPhoneIdToSlotId item to INVALID_SLOT_ID upon ss->ds switch."

parents bf3e98e1 d459194b

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -546,7 +546,11 @@ public class UiccController extends Handler { 
        // Resize array.

        // Resize array.

        mPhoneIdToSlotId = copyOf(mPhoneIdToSlotId, mCis.length);

        mPhoneIdToSlotId = copyOf(mPhoneIdToSlotId, mCis.length);





        // Register for new active modem for ss -> ds switch.

        // For ds -> ss switch, there's no need to unregister as the mCis should unregister

        // everything itself.

        for (int i = prevActiveModemCount; i < mCis.length; i++) {

        for (int i = prevActiveModemCount; i < mCis.length; i++) {

            mPhoneIdToSlotId[i] = INVALID_SLOT_ID;

            mCis[i].registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, i);

            mCis[i].registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, i);





            /*

            /*