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

Commit 90f5ba57 authored by Umashankar Godachi's avatar Umashankar Godachi Committed by Gerrit - the friendly Code Review server
Browse files

Fix IccId query after Modem reset. 

Currently if modem reset/SSR happens while iccid query
is in going on, then icc id query gets aborted and the
icc id value is not updated. This results in no subscription
activation.

Fix: If the old card state and new card state is present
and the iccid is ICCID_STRING_FOR_NO_SIM then requery for iccid.

Change-Id: I89d98bf33e67d11168c97c849d5db68f9b8b3ec3
CRs-Fixed: 811251.
parent a78157b1

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+5 −1
Original line number Diff line number Diff line
@@ -336,8 +336,12 @@ public class SubscriptionInfoUpdater extends Handler { 
            }

            queryIccId(slotId);

        } else if (oldState.isCardPresent() && newState.isCardPresent() &&

                (!subHelper.isApmSIMNotPwdn()) && (mIccId[slotId] == null)) {

                (((!subHelper.isApmSIMNotPwdn()) && (mIccId[slotId] == null)) ||

                (mIccId[slotId] != null && mIccId[slotId].equals(ICCID_STRING_FOR_NO_SIM)))) {

            // If old and new card state is present and ICCID is "", query the ICCID again

            // to process SET_UICC request

            logd("SIM" + (slotId + 1) + " powered up from APM ");

            mIccId[slotId] = null;

            mFh[slotId] = null;

            mNeedUpdate = true;

            queryIccId(slotId);