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

Commit 9cc67c25 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Fix CdmsSmsTests and NPE in CdmaSmsAddress parsing"

parents e96e9aea 5f5b7e9d

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,9 @@ public class CdmaSmsAddress extends SmsAddress { 
        }

        }





        if (addr.digitMode == DIGIT_MODE_8BIT_CHAR) {

        if (addr.digitMode == DIGIT_MODE_8BIT_CHAR) {

            filteredAddr = filterWhitespace(filteredAddr);

            if (filteredAddr == null) {

                filteredAddr = filterWhitespace(address);

            }

            origBytes = UserData.stringToAscii(filteredAddr);

            origBytes = UserData.stringToAscii(filteredAddr);

            if (origBytes == null) {

            if (origBytes == null) {

                return null;

                return null;

tests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -82,11 +82,12 @@ public class CdmaSmsTest extends AndroidTestCase { 
        }

        }

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

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

        assertEquals(addr.ton, CdmaSmsAddress.TON_INTERNATIONAL_OR_IP);

        assertEquals(addr.ton, CdmaSmsAddress.TON_INTERNATIONAL_OR_IP);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_4BIT_DTMF);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR);

        assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK);

        assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK);

        assertEquals(addr.numberOfDigits, 12);

        assertEquals(addr.numberOfDigits, 12);

        assertEquals(addr.origBytes.length, 12);

        assertEquals(addr.origBytes.length, 12);

        byte[] data3 = {8, 8, 6, 9, 1, 7, 2, 2, 2, 5, 5, 5};

        // for DIGIT_MODE_8BIT_CHAR, origBytes calls stringToAscii

        byte[] data3 = {'8', '8', '6', '9', '1', '7', '2', '2', '2', '5', '5', '5'};

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

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

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

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

        }

        }
@@ -106,7 +107,7 @@ public class CdmaSmsTest extends AndroidTestCase { 
        addr = CdmaSmsAddress.parse("foo bar");

        addr = CdmaSmsAddress.parse("foo bar");

        assertEquals(addr.ton, CdmaSmsAddress.TON_UNKNOWN);

        assertEquals(addr.ton, CdmaSmsAddress.TON_UNKNOWN);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR);

        assertEquals(addr.digitMode, CdmaSmsAddress.DIGIT_MODE_8BIT_CHAR);

        assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_DATA_NETWORK);

        assertEquals(addr.numberMode, CdmaSmsAddress.NUMBER_MODE_NOT_DATA_NETWORK);

        assertEquals(addr.numberOfDigits, 6);

        assertEquals(addr.numberOfDigits, 6);

        assertEquals(addr.origBytes.length, 6);

        assertEquals(addr.origBytes.length, 6);

        assertEquals(new String(addr.origBytes), "foobar");

        assertEquals(new String(addr.origBytes), "foobar");