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

Commit 6ab3bb1e authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Always query ICCID from Uicc for locked SIM." into rvc-dev am: 69493a1f

Change-Id: I9370a39a4a9dd686edb3752ab55879c89b155e20
parents 0a65cdcc 69493a1f
Loading
Loading
Loading
Loading
+14 −19
Original line number Diff line number Diff line
@@ -374,8 +374,6 @@ public class SubscriptionInfoUpdater extends Handler {
            sIccId[phoneId] = null;
        }

        String iccId = sIccId[phoneId];
        if (iccId == null) {
        IccCard iccCard = PhoneFactory.getPhone(phoneId).getIccCard();
        if (iccCard == null) {
            logd("handleSimLocked: IccCard null");
@@ -391,9 +389,6 @@ public class SubscriptionInfoUpdater extends Handler {
            return;
        }
        sIccId[phoneId] = IccUtils.stripTrailingFs(records.getFullIccId());
        } else {
            logd("NOT Querying IccId its already set sIccid[" + phoneId + "]=" + iccId);
        }

        updateSubscriptionInfoByIccId(phoneId, true /* updateEmbeddedSubs */);

+2 −1
Original line number Diff line number Diff line
@@ -500,7 +500,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest {
    @Test
    @SmallTest
    public void testSimLockWithIccId() throws Exception {
        /* no need for IccId query */
        // ICCID will be queried even if it is already available
        doReturn("98106240020000000000").when(mIccRecord).getFullIccId();

        replaceInstance(SubscriptionInfoUpdater.class, "sIccId", null,
                new String[]{"89012604200000000000"});