Merge "resolve merge conflicts of 1b75d80ffff871e31a69d77a865c8309ed64c6ff to... (e0854959) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -1727,6 +1727,13 @@ public class GsmCdmaPhone extends Phone {
		IccRecords r = mIccRecords.get();
		return (r != null) ? r.getMsisdnNumber() : null;
		} 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();
		}
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -969,4 +969,30 @@ public class GsmCdmaPhoneTest extends TelephonyTest {
		ss.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN);
		assertEquals(mPhoneUT.getCsCallRadioTech(), ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN);
		}

		@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());
		}
		}