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

Commit f08c40a2 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

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

am: a65281c9

Change-Id: I2a945dc3b6548598f6b86a24fdc26793924779c6
parents 4b83b24d a65281c9
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -546,7 +546,11 @@ public class UiccController extends Handler {
        // Resize array.
        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++) {
            mPhoneIdToSlotId[i] = INVALID_SLOT_ID;
            mCis[i].registerForIccStatusChanged(this, EVENT_ICC_STATUS_CHANGED, i);

            /*