am 7589ae77: am ef5aed64: am 5c8dba21: Merge change I61aac7b3 into eclair

Merge commit '7589ae77224a28a2162cde74c3ae8b1d826c635c'

* commit '7589ae77224a28a2162cde74c3ae8b1d826c635c':
  Add PERIOD char to CDMA address sugar list.

2 files changed, 11 insertions, 1 deletions

diff --git a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
index d9cc2c6..f49b502 100644
--- a/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
+++ b/telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
@@ -135,7 +135,7 @@ public class CdmaSmsAddress extends SmsAddress {
     };
 
     private static final char[] numericCharsSugar = {
-        '(', ')', ' ', '-', '+'
+        '(', ')', ' ', '-', '+', '.'
     };
 
     private static final SparseBooleanArray numericCharDialableMap = new SparseBooleanArray (
diff --git a/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
index 4a77e19..85840a8 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java
@@ -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);