Merge "Always query ICCID from Uicc for locked SIM." into rvc-dev am: 69493a1f2f am: 6ab3bb1ee3 (5b0f49bc) · Commits · e / os / android_frameworks_opt_telephony

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

+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"});