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

Commit 5ca81e86 authored by Mengjun Leng's avatar Mengjun Leng Committed by Hall Liu
Browse files

Reserve orignal dial string for CDMA 

The requirement of some customers needs to show an orignal dial string
for CDMA MO call, so save the original dial string left to upper layer.

Bug: 62074217
Test: testOriginalDialString
Change-Id: I6f20513d8513cfe5972a4a472b11b497eb12cf97
parent 181cff5e

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -155,9 +155,8 @@ public class GsmCdmaConnection extends Connection { 
        mOwner = ct;

        mOwner = ct;

        mHandler = new MyHandler(mOwner.getLooper());

        mHandler = new MyHandler(mOwner.getLooper());





        if (isPhoneTypeGsm()) {

        mDialString = dialString;

        mDialString = dialString;

        } else {

        if (!isPhoneTypeGsm()) {

            Rlog.d(LOG_TAG, "[GsmCdmaConn] GsmCdmaConnection: dialString=" +

            Rlog.d(LOG_TAG, "[GsmCdmaConn] GsmCdmaConnection: dialString=" +

                    maskDialString(dialString));

                    maskDialString(dialString));

            dialString = formatDialString(dialString);

            dialString = formatDialString(dialString);

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

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

        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

    @Test @SmallTest

    public void testSanityGSM() {

    public void testSanityGSM() {

        connection = new GsmCdmaConnection(mPhone, String.format(

        connection = new GsmCdmaConnection(mPhone, String.format(
@@ -102,8 +115,7 @@ public class GsmCdmaConnectionTest extends TelephonyTest { 
        assertEquals(PhoneConstants.PRESENTATION_ALLOWED, connection.getNumberPresentation());

        assertEquals(PhoneConstants.PRESENTATION_ALLOWED, connection.getNumberPresentation());

        assertFalse(connection.isMultiparty());

        assertFalse(connection.isMultiparty());

        assertNotNull(connection.getRemainingPostDialString());

        assertNotNull(connection.getRemainingPostDialString());

        /* CDMA phone type dont have origDialString */

        assertEquals("+1 (700).555-41NN,1234", connection.getOrigDialString());

        assertNull(connection.getOrigDialString());

    }

    }





    @Test @SmallTest

    @Test @SmallTest