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

Commit 5c8dba21 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I61aac7b3 into eclair 

* changes:
  Add PERIOD char to CDMA address sugar list.
parents 5fbaefc3 61aac7b3

telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class CdmaSmsAddress extends SmsAddress { 
    };



    private static final char[] numericCharsSugar = {

        '(', ')', ' ', '-', '+'

        '(', ')', ' ', '-', '+', '.'

    };



    private static final SparseBooleanArray numericCharDialableMap = new SparseBooleanArray (

tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java

+10 −0
Original line number Diff line number Diff line
@@ -61,6 +61,16 @@ public class CdmaSmsTest extends AndroidTestCase { 
        for (int i = 0; i < data2.length; i++) {

            assertEquals(addr.origBytes[i], data2[i]);

        }

        addr = CdmaSmsAddress.parse("650.253.1000");

        assertEquals(addr.ton, CdmaSmsAddress.TON_UNKNOWN);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF);

        assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK);

        assertEquals(addr.numberOfDigits, 10);

        assertEquals(addr.origBytes.length, 10);

        byte[] data5 = {6, 5, 10, 2, 5, 3, 1, 10, 10, 10};

        for (int i = 0; i < data2.length; i++) {

            assertEquals(addr.origBytes[i], data5[i]);

        }

        addr = CdmaSmsAddress.parse("(+886) 917 222 555");

        assertEquals(addr.ton, CdmaSmsAddress.TON_INTERNATIONAL_OR_IP);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF);