From 77aadd284847681bd66af639636c2fa43e418c2b Mon Sep 17 00:00:00 2001 From: Shaopeng Jia Date: Mon, 11 Feb 2013 12:21:46 +0100 Subject: Update external/libphonenumber to v5.3 Change-Id: Ic350cdd9924d5de89c959fa42fab36a8b66484a4 --- README.android | 2 +- java/release_notes.txt | 22 +++++++++++++++++++++ .../i18n/phonenumbers/AsYouTypeFormatter.java | 4 ++-- .../phonenumbers/CountryCodeToRegionCodeMap.java | 3 ++- .../android/i18n/phonenumbers/PhoneNumberUtil.java | 17 ++++++++++------ .../android/i18n/phonenumbers/ShortNumberUtil.java | 3 +-- .../phonenumbers/data/PhoneNumberMetadataProto_AE | Bin 611 -> 625 bytes .../phonenumbers/data/PhoneNumberMetadataProto_AW | Bin 435 -> 439 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BE | Bin 730 -> 727 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BF | Bin 446 -> 444 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BR | Bin 888 -> 1279 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BW | Bin 608 -> 619 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CL | Bin 956 -> 962 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CN | Bin 3373 -> 3404 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CO | Bin 985 -> 982 bytes .../phonenumbers/data/PhoneNumberMetadataProto_CR | Bin 635 -> 636 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DE | Bin 2089 -> 2101 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EH | Bin 0 -> 371 bytes .../phonenumbers/data/PhoneNumberMetadataProto_GB | Bin 2865 -> 2866 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IN | Bin 3687 -> 3706 bytes .../phonenumbers/data/PhoneNumberMetadataProto_JO | Bin 1020 -> 1019 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KE | Bin 626 -> 626 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KH | Bin 618 -> 623 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KW | Bin 517 -> 517 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LT | Bin 629 -> 680 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MA | Bin 777 -> 778 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ML | Bin 450 -> 409 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MM | Bin 788 -> 1252 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MU | Bin 530 -> 538 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NG | Bin 1278 -> 1275 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PG | Bin 468 -> 459 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PK | Bin 1784 -> 1788 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PL | Bin 876 -> 878 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RO | Bin 647 -> 646 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RW | Bin 490 -> 490 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SR | Bin 458 -> 459 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SY | Bin 484 -> 477 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TR | Bin 748 -> 741 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VU | Bin 399 -> 403 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ZA | Bin 737 -> 725 bytes .../phonenumbers/data/PhoneNumberMetadataProto_ZM | Bin 414 -> 411 bytes .../i18n/phonenumbers/geocoding/data/241_en | Bin 0 -> 469 bytes .../android/i18n/phonenumbers/geocoding/data/27_en | Bin 601 -> 634 bytes .../android/i18n/phonenumbers/geocoding/data/32_en | Bin 0 -> 548 bytes .../android/i18n/phonenumbers/geocoding/data/32_fr | Bin 0 -> 188 bytes .../android/i18n/phonenumbers/geocoding/data/32_nl | Bin 0 -> 212 bytes .../i18n/phonenumbers/geocoding/data/359_bg | Bin 0 -> 54676 bytes .../i18n/phonenumbers/geocoding/data/359_en | Bin 0 -> 35927 bytes .../android/i18n/phonenumbers/geocoding/data/86_en | Bin 7197 -> 7178 bytes .../android/i18n/phonenumbers/geocoding/data/86_zh | Bin 8523 -> 8499 bytes .../i18n/phonenumbers/geocoding/data/config | Bin 5075 -> 5123 bytes .../CountryCodeToRegionCodeMapForTesting.java | 8 ++++++-- .../i18n/phonenumbers/PhoneNumberUtilTest.java | 8 ++++++++ .../com/android/i18n/phonenumbers/RegionCode.java | 1 + .../data/PhoneNumberMetadataProtoForTesting_AE | Bin 0 -> 248 bytes 55 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/241_en create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/32_en create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/32_fr create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/32_nl create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/359_bg create mode 100644 java/src/com/android/i18n/phonenumbers/geocoding/data/359_en create mode 100644 java/test/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE diff --git a/README.android b/README.android index a27771e9..9b4c3e23 100644 --- a/README.android +++ b/README.android @@ -1,5 +1,5 @@ URL: http://code.google.com/p/libphonenumber/ -Version: 5.2 (r536) +Version: 5.3 (r552) License: Apache 2 Description: Google Phone Number Library. Local Modification: diff --git a/java/release_notes.txt b/java/release_notes.txt index cf9539ce..2680dcdb 100644 --- a/java/release_notes.txt +++ b/java/release_notes.txt @@ -1,3 +1,25 @@ +Jan 08, 2013: libphonenumber-5.3 +* Code changes: + - Handling UAN numbers in Argentina better when dialling them locally from a + mobile +* Metadata changes: + - Updated metadata for region code(s): + BE, BW, CL, CN, CO, EH, KW, MA, ML, NG, PL, SY, ZA, ZM + - New geocoding data for country calling code(s): 32 (en, fr, nl) + - Updated geocoding data for country calling code(s): 27 (en), 86 (en, zh) + +Dec 06, 2012: libphonenumber-5.2.2 +* Metadata changes: + - New metadata for region code(s): EH + - Updated metadata for region code(s): BR, CL, CR, IN, MA, PG, PK, RO + - New geocoding data for country calling code(s): 241 (en) + +Nov 26, 2012: libphonenumber-5.2.1 +* Metadata changes: + - Updated metadata for region code(s): + AE, AW, BF, CN, DE, JO, KE, KH, LT, MM, MU, NG, RW, SR, TR, VU + - New geocoding data for country calling code(s): 359 (bg, en) + Oct 10, 2012: libphonenumber-5.2 * Code changes: - Adds isNumberGeographical() method. diff --git a/java/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java b/java/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java index 2c8ac448..604d5737 100644 --- a/java/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/java/src/com/android/i18n/phonenumbers/AsYouTypeFormatter.java @@ -397,8 +397,8 @@ public class AsYouTypeFormatter { // Put the extracted NDD back to the national number before attempting to extract a new NDD. nationalNumber.insert(0, nationalPrefixExtracted); // Remove the previously extracted NDD from prefixBeforeNationalNumber. We cannot simply set - // it to empty string because people sometimes enter national prefix after country code, e.g - // +44 (0)20-1234-5678. + // it to empty string because people sometimes incorrectly enter national prefix after the + // country code, e.g. +44 (0)20-1234-5678. int indexOfPreviousNdd = prefixBeforeNationalNumber.lastIndexOf(nationalPrefixExtracted); prefixBeforeNationalNumber.setLength(indexOfPreviousNdd); } diff --git a/java/src/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/src/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMap.java index ab79a478..a4c982b1 100644 --- a/java/src/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMap.java +++ b/java/src/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMap.java @@ -257,8 +257,9 @@ public class CountryCodeToRegionCodeMap { listWithRegionCode.add("SS"); countryCodeToRegionCodeMap.put(211, listWithRegionCode); - listWithRegionCode = new ArrayList(1); + listWithRegionCode = new ArrayList(2); listWithRegionCode.add("MA"); + listWithRegionCode.add("EH"); countryCodeToRegionCodeMap.put(212, listWithRegionCode); listWithRegionCode = new ArrayList(1); diff --git a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java index 5c54f619..32076ef5 100644 --- a/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java +++ b/java/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java @@ -1220,6 +1220,11 @@ public class PhoneNumberUtil { // In Peru, numbers cannot be dialled using E164 format from a mobile phone for Movistar. // Instead they must be dialled in national format. formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL); + } else if (regionCode.equals("AE") && regionCallingFrom.equals("AE") && + numberType == PhoneNumberType.UAN) { + // In the United Arab Emirates, numbers with the prefix 600 (UAN numbers) cannot be dialled + // using E164 format. Instead they must be dialled in national format. + formattedNumber = format(numberNoExt, PhoneNumberFormat.NATIONAL); } else if (regionCode.equals("BR") && regionCallingFrom.equals("BR") && ((numberType == PhoneNumberType.FIXED_LINE) || (numberType == PhoneNumberType.MOBILE) || (numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE))) { @@ -1279,12 +1284,12 @@ public class PhoneNumberUtil { return countryCallingCode + " " + format(number, PhoneNumberFormat.NATIONAL); } } else if (countryCallingCode == getCountryCodeForValidRegion(regionCallingFrom)) { - // If regions share a country calling code, the country calling code need not be dialled. - // This also applies when dialling within a region, so this if clause covers both these cases. - // Technically this is the case for dialling from La Reunion to other overseas departments of - // France (French Guiana, Martinique, Guadeloupe), but not vice versa - so we don't cover this - // edge case for now and for those cases return the version including country calling code. - // Details here: http://www.petitfute.com/voyage/225-info-pratiques-reunion + // If regions share a country calling code, the country calling code need not be dialled. + // This also applies when dialling within a region, so this if clause covers both these cases. + // Technically this is the case for dialling from La Reunion to other overseas departments of + // France (French Guiana, Martinique, Guadeloupe), but not vice versa - so we don't cover this + // edge case for now and for those cases return the version including country calling code. + // Details here: http://www.petitfute.com/voyage/225-info-pratiques-reunion return format(number, PhoneNumberFormat.NATIONAL); } // Metadata cannot be null because we checked 'isValidRegionCode()' above. diff --git a/java/src/com/android/i18n/phonenumbers/ShortNumberUtil.java b/java/src/com/android/i18n/phonenumbers/ShortNumberUtil.java index 3f47e7db..bce408d1 100644 --- a/java/src/com/android/i18n/phonenumbers/ShortNumberUtil.java +++ b/java/src/com/android/i18n/phonenumbers/ShortNumberUtil.java @@ -84,8 +84,7 @@ public class ShortNumberUtil { Pattern emergencyNumberPattern = Pattern.compile(metadata.getEmergency().getNationalNumberPattern()); String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); - // In Brazil, it is impossible to append additional digits to an emergency number to dial the - // number. + // In Brazil, emergency numbers don't work when additional digits are appended. return (!allowPrefixMatch || regionCode.equals("BR")) ? emergencyNumberPattern.matcher(normalizedNumber).matches() : emergencyNumberPattern.matcher(normalizedNumber).lookingAt(); diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE index b75959f6..ac2cac9e 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW index 151327c3..0c0759e1 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE index f53db366..27e37398 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF index 370c7aca..82942ae9 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR index 96d2ae4e..798f2e07 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW index e1c6492e..98467336 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL index 2e74d26a..9a4dbda7 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN index ae35d25d..d79fb8b6 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO index 2c6db028..ed8db9c0 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR index 7f6746e3..4dca01be 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE index 76e92130..4ded4fd4 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH new file mode 100644 index 00000000..0de408e7 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB index e6d3b8f0..3fd5c9d4 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN index a3f78a72..8c292da7 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO index 56053cb2..d67ceabc 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE index a7c91d43..49d926c5 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH index 158a8c2a..a333014b 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW index 2f5c8368..05d679fb 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT index 4b646f75..f27324b0 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA index 66f55b88..9ac0659c 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML index fb17e683..844175e8 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM index e0eb9f87..24cb2049 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU index 88781324..c0b385ec 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG index 253b2ed5..b580b8fd 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG index 335cda0f..69c2b2ca 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK index 4bc0e397..b426dc86 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL index 9424b977..e59f139e 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO index 3e8489d1..dfb01b4a 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW index 8203e517..fd576a99 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR index 61c0f25f..9603fb84 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY index 04618ff7..06b2f5cb 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR index 58d2d948..d3fb7805 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU index b918549c..8d07f904 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA index 82fbcb34..4db71966 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA differ diff --git a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM index cef8f8c3..cb6d6c76 100644 Binary files a/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM and b/java/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/241_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/241_en new file mode 100644 index 00000000..82c7f623 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/241_en differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/27_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/27_en index c86a27c7..6331f15a 100644 Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/27_en and b/java/src/com/android/i18n/phonenumbers/geocoding/data/27_en differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/32_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_en new file mode 100644 index 00000000..0bd8b56b Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_en differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/32_fr b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_fr new file mode 100644 index 00000000..23df1d74 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_fr differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/32_nl b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_nl new file mode 100644 index 00000000..74a5c6c9 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/32_nl differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/359_bg b/java/src/com/android/i18n/phonenumbers/geocoding/data/359_bg new file mode 100644 index 00000000..11573e00 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/359_bg differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/359_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/359_en new file mode 100644 index 00000000..7daae272 Binary files /dev/null and b/java/src/com/android/i18n/phonenumbers/geocoding/data/359_en differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en index fcc86520..4cb4f563 100644 Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en and b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_en differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh index ed87a7bc..dbec3ce9 100644 Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh and b/java/src/com/android/i18n/phonenumbers/geocoding/data/86_zh differ diff --git a/java/src/com/android/i18n/phonenumbers/geocoding/data/config b/java/src/com/android/i18n/phonenumbers/geocoding/data/config index 601c2833..9cb67089 100644 Binary files a/java/src/com/android/i18n/phonenumbers/geocoding/data/config and b/java/src/com/android/i18n/phonenumbers/geocoding/data/config differ diff --git a/java/test/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/java/test/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java index ada7c824..38920e3d 100644 --- a/java/test/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java +++ b/java/test/com/android/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java @@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMapForTesting { // countries sharing a calling code, such as the NANPA countries, the one // indicated with "isMainCountryForCode" in the metadata should be first. static Map> getCountryCodeToRegionCodeMap() { - // The capacity is set to 25 as there are 19 different country codes, + // The capacity is set to 26 as there are 20 different country codes, // and this offers a load factor of roughly 0.75. Map> countryCodeToRegionCodeMap = - new HashMap>(25); + new HashMap>(26); ArrayList listWithRegionCode; @@ -112,6 +112,10 @@ public class CountryCodeToRegionCodeMapForTesting { listWithRegionCode.add("001"); countryCodeToRegionCodeMap.put(800, listWithRegionCode); + listWithRegionCode = new ArrayList(1); + listWithRegionCode.add("AE"); + countryCodeToRegionCodeMap.put(971, listWithRegionCode); + listWithRegionCode = new ArrayList(1); listWithRegionCode.add("001"); countryCodeToRegionCodeMap.put(979, listWithRegionCode); diff --git a/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java b/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java index 430a4c0c..0db9f75c 100644 --- a/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/java/test/com/android/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -41,6 +41,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // any risk of accidental changes to mutable static state affecting many tests. private static final PhoneNumber ALPHA_NUMERIC_NUMBER = new PhoneNumber().setCountryCode(1).setNationalNumber(80074935247L); + private static final PhoneNumber AE_UAN = + new PhoneNumber().setCountryCode(971).setNationalNumber(600123456L); private static final PhoneNumber AR_MOBILE = new PhoneNumber().setCountryCode(54).setNationalNumber(91187654321L); private static final PhoneNumber AR_NUMBER = @@ -725,6 +727,12 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatNumberForMobileDialing(INTERNATIONAL_TOLL_FREE, RegionCode.JP, false)); assertEquals("+800 1234 5678", phoneUtil.formatNumberForMobileDialing(INTERNATIONAL_TOLL_FREE, RegionCode.JP, true)); + + // UAE numbers beginning with 600 (classified as UAN) need to be dialled without +971 locally. + assertEquals("+971600123456", + phoneUtil.formatNumberForMobileDialing(AE_UAN, RegionCode.JP, false)); + assertEquals("600123456", + phoneUtil.formatNumberForMobileDialing(AE_UAN, RegionCode.AE, false)); } public void testFormatByPattern() { diff --git a/java/test/com/android/i18n/phonenumbers/RegionCode.java b/java/test/com/android/i18n/phonenumbers/RegionCode.java index 89b68178..4312f7f1 100644 --- a/java/test/com/android/i18n/phonenumbers/RegionCode.java +++ b/java/test/com/android/i18n/phonenumbers/RegionCode.java @@ -23,6 +23,7 @@ final class RegionCode { // Region code for global networks (e.g. +800 numbers). static final String UN001 = "001"; static final String AD = "AD"; + static final String AE = "AE"; static final String AO = "AO"; static final String AQ = "AQ"; static final String AR = "AR"; diff --git a/java/test/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE b/java/test/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE new file mode 100644 index 00000000..c4f0cd22 Binary files /dev/null and b/java/test/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE differ -- cgit v1.2.3