Snap for 5363709 from 1b75d80ffff871e31a69d77a865c8309ed64c6ff to pi-qpr3-b-release (6605646e) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1610,6 +1610,13 @@ public class GsmCdmaPhone extends Phone {
	IccRecords r = mIccRecords.get();		IccRecords r = mIccRecords.get();
	return (r != null) ? r.getMsisdnNumber() : null;		return (r != null) ? r.getMsisdnNumber() : null;
	} else {		} else {
			CarrierConfigManager configManager = (CarrierConfigManager)
			mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
			boolean use_usim = configManager.getConfigForSubId(getSubId()).getBoolean(
			CarrierConfigManager.KEY_USE_USIM_BOOL);
			if (use_usim) {
			return (mSimRecords != null) ? mSimRecords.getMsisdnNumber() : null;
			}
	return mSST.getMdnNumber();		return mSST.getMdnNumber();
	}		}
	}		}

+26 −0

Original line number	Original line	Diff line number	Diff line
	@@ -957,4 +957,30 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
	assertEquals(EVENT_SET_ICC_LOCK_ENABLED, message.what);		assertEquals(EVENT_SET_ICC_LOCK_ENABLED, message.what);
	assertTrue(ret.exception != null);		assertTrue(ret.exception != null);
	}		}

			@Test
			@SmallTest
			public void testGetLine1NumberForGsmPhone() {
			final String msisdn = "+1234567890";
			doReturn(msisdn).when(mSimRecords).getMsisdnNumber();

			switchToGsm();
			assertEquals(msisdn, mPhoneUT.getLine1Number());
			}

			@Test
			@SmallTest
			public void testGetLine1NumberForCdmaPhone() {
			final String mdn = "1234567890";
			final String msisdn = "+1234567890";
			doReturn(mdn).when(mSST).getMdnNumber();
			doReturn(msisdn).when(mSimRecords).getMsisdnNumber();

			switchToCdma();
			assertEquals(mdn, mPhoneUT.getLine1Number());

			mContextFixture.getCarrierConfigBundle().putBoolean(
			CarrierConfigManager.KEY_USE_USIM_BOOL, true);
			assertEquals(msisdn, mPhoneUT.getLine1Number());
			}
	}		}