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

Merge "Preserve '+' in phone numbers imported from SIM."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-05-13 11:06:28 -07:00
committed by Android Code Review
parent f3ca9a5c7e ce2a97aeb8
commit ecfb185eed
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -689,7 +689,8 @@ public class PhoneNumberUtils
return "";
}
if ((bytes[offset] & 0xff) == TOA_International) {
//Only TON field should be taken in concideration
if ((bytes[offset] & 0xf0) == (TOA_International & 0xf0)) {
prependPlus = true;
}

10
tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java
View File

@@ -82,6 +82,16 @@ public class PhoneNumberUtilsTest extends TestCase {
assertEquals("17005550020",
PhoneNumberUtils.calledPartyBCDToString(b, 0, 7));
b[0] = (byte) 0x80; b[1] = (byte) 0x71; b[2] = (byte) 0x00; b[3] = (byte) 0x55;
b[4] = (byte) 0x05; b[5] = (byte) 0x20; b[6] = (byte) 0xF0;
assertEquals("17005550020",
PhoneNumberUtils.calledPartyBCDToString(b, 0, 7));
b[0] = (byte) 0x90; b[1] = (byte) 0x71; b[2] = (byte) 0x00; b[3] = (byte) 0x55;
b[4] = (byte) 0x05; b[5] = (byte) 0x20; b[6] = (byte) 0xF0;
assertEquals("+17005550020",
PhoneNumberUtils.calledPartyBCDToString(b, 0, 7));
b[0] = (byte) 0x91; b[1] = (byte) 0x71; b[2] = (byte) 0x00; b[3] = (byte) 0x55;
b[4] = (byte) 0x05; b[5] = (byte) 0x20; b[6] = (byte) 0xF0;
assertEquals("+17005550020",