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

Commit 14b828c8 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Use getFullIccId() in SubscriptionInfoUpdater." into nyc-dev 

am: edebaf37

* commit 'edebaf37':
  Use getFullIccId() in SubscriptionInfoUpdater.

Change-Id: I3abf36c12106c109e50cedb58bf64af6a25e76d2
parents 6a4f8357 edebaf37

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

+2 −2
Original line number Diff line number Diff line
@@ -364,11 +364,11 @@ public class SubscriptionInfoUpdater extends Handler { 
            logd("onRecieve: IccRecords null");

            return;

        }

        if (records.getIccId() == null) {

        if (records.getFullIccId() == null) {

            logd("onRecieve: IccID null");

            return;

        }

        mIccId[slotId] = records.getIccId();

        mIccId[slotId] = records.getFullIccId();



        if (isAllIccIdQueryDone()) {

            updateSubscriptionInfoByIccId();

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        /* mock new sim got loaded and there is no sim loaded before */

        doReturn(null).when(mSubscriptionController)

                .getSubInfoUsingSlotIdWithCheck(eq(0), anyBoolean(), anyString());

        doReturn("89012604200000000000").when(mIccRecord).getIccId();

        doReturn("89012604200000000000").when(mIccRecord).getFullIccId();

        doReturn(FAKE_PLMN).when(mTelephonyManager).getSimOperatorNumericForPhone(0);

        Intent mIntent = new Intent(IccCardProxy.ACTION_INTERNAL_SIM_STATE_CHANGED);

        mIntent.putExtra(IccCardConstants.INTENT_KEY_ICC_STATE,