Merge "Reserve orignal dial string for CDMA" (974e3d6e) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -155,9 +155,8 @@ public class GsmCdmaConnection extends Connection {
		mOwner = ct;
		mHandler = new MyHandler(mOwner.getLooper());

		if (isPhoneTypeGsm()) {
		mDialString = dialString;
		} else {
		if (!isPhoneTypeGsm()) {
		Rlog.d(LOG_TAG, "[GsmCdmaConn] GsmCdmaConnection: dialString=" +
		maskDialString(dialString));
		dialString = formatDialString(dialString);

+14 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,19 @@ public class GsmCdmaConnectionTest extends TelephonyTest {
		assertEquals("+1 (700).555-41NN;1234", formattedDialStr);
		}

		@Test @SmallTest
		public void testOriginalDialString(){
		doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mPhone).getPhoneType();
		connection = new GsmCdmaConnection(mPhone, "+8610000", mCT, null,
		false /isEmergencyCall/);
		assertEquals("+8610000", connection.getOrigDialString());

		doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mPhone).getPhoneType();
		connection = new GsmCdmaConnection(mPhone, "+8610000", mCT, null,
		false /isEmergencyCall/);
		assertEquals("+8610000", connection.getOrigDialString());
		}

		@Test @SmallTest
		public void testSanityGSM() {
		connection = new GsmCdmaConnection(mPhone, String.format(
		@@ -102,8 +115,7 @@ public class GsmCdmaConnectionTest extends TelephonyTest {
		assertEquals(PhoneConstants.PRESENTATION_ALLOWED, connection.getNumberPresentation());
		assertFalse(connection.isMultiparty());
		assertNotNull(connection.getRemainingPostDialString());
		/* CDMA phone type dont have origDialString */
		assertNull(connection.getOrigDialString());
		assertEquals("+1 (700).555-41NN,1234", connection.getOrigDialString());
		}

		@Test @SmallTest