Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I61aac7b3 into eclair

Browse Source 
* changes:
  Add PERIOD char to CDMA address sugar list.
This commit is contained in:
Android (Google) Code Review
2009-10-05 22:19:46 -04:00
parent 5fbaefc3d8 61aac7b377
commit 5c8dba21bf
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
View File

@@ -135,7 +135,7 @@ public class CdmaSmsAddress extends SmsAddress {
};
private static final char[] numericCharsSugar = {
'(', ')', ' ', '-', '+'
'(', ')', ' ', '-', '+', '.'
};
private static final SparseBooleanArray numericCharDialableMap = new SparseBooleanArray (

10
tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
View File

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