From d69017852a87e769db7109bca3cd1323d990c76d Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 23 Aug 2017 14:44:05 +0100 Subject: Upgrade to 8.8.0 Created using ./update-from-external.sh 8.8.0 m -j32 droid adb reboot bootloader fastboot flashall -w m -j32 cts cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest m -j32 libphonenumber-test vogar dx vogar --timeout 0 \ --classpath ${ANDROID_BUILD_TOP}/out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \ com.google.i18n.phonenumbers Bug: 64924629 Test: see above Change-Id: Ie7e152ed0d1cb6c39525764a99b9c3eda9be61f7 --- libphonenumber/pom.xml | 4 ++-- .../com/google/i18n/phonenumbers/PhoneNumberUtil.java | 18 +++++++----------- .../phonenumbers/data/PhoneNumberMetadataProto_AX | Bin 954 -> 954 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BF | Bin 428 -> 423 bytes .../phonenumbers/data/PhoneNumberMetadataProto_BG | Bin 1002 -> 1008 bytes .../phonenumbers/data/PhoneNumberMetadataProto_DM | Bin 506 -> 506 bytes .../phonenumbers/data/PhoneNumberMetadataProto_EG | Bin 751 -> 804 bytes .../phonenumbers/data/PhoneNumberMetadataProto_FI | Bin 1605 -> 1605 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IN | Bin 5613 -> 5623 bytes .../phonenumbers/data/PhoneNumberMetadataProto_IR | Bin 773 -> 804 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KY | Bin 607 -> 615 bytes .../phonenumbers/data/PhoneNumberMetadataProto_KZ | Bin 858 -> 877 bytes .../phonenumbers/data/PhoneNumberMetadataProto_LC | Bin 527 -> 530 bytes .../phonenumbers/data/PhoneNumberMetadataProto_MT | Bin 552 -> 549 bytes .../phonenumbers/data/PhoneNumberMetadataProto_NI | Bin 356 -> 399 bytes .../phonenumbers/data/PhoneNumberMetadataProto_PL | Bin 860 -> 980 bytes .../phonenumbers/data/PhoneNumberMetadataProto_RU | Bin 788 -> 806 bytes .../phonenumbers/data/PhoneNumberMetadataProto_SZ | Bin 349 -> 349 bytes .../phonenumbers/data/PhoneNumberMetadataProto_TH | Bin 619 -> 577 bytes .../phonenumbers/data/PhoneNumberMetadataProto_US | Bin 1681 -> 1683 bytes .../phonenumbers/data/PhoneNumberMetadataProto_VC | Bin 549 -> 549 bytes .../phonenumbers/data/ShortNumberMetadataProto_BA | Bin 195 -> 327 bytes .../phonenumbers/data/ShortNumberMetadataProto_IR | Bin 568 -> 612 bytes .../phonenumbers/data/ShortNumberMetadataProto_PL | Bin 297 -> 317 bytes .../phonenumbers/data/ShortNumberMetadataProto_RU | Bin 210 -> 232 bytes .../phonenumbers/data/ShortNumberMetadataProto_TH | Bin 350 -> 910 bytes .../phonenumbers/data/ShortNumberMetadataProto_ZA | Bin 411 -> 419 bytes .../google/i18n/phonenumbers/PhoneNumberUtilTest.java | 7 +++++++ 28 files changed, 16 insertions(+), 13 deletions(-) (limited to 'libphonenumber') diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index e45f41ba..9ea40c47 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ 4.0.0 com.googlecode.libphonenumber libphonenumber - 8.7.1 + 8.8.0 jar https://github.com/googlei18n/libphonenumber/ com.googlecode.libphonenumber libphonenumber-parent - 8.7.1 + 8.8.0 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 9aa3152d..bc8a53eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -656,7 +656,6 @@ public class PhoneNumberUtil { Matcher trailingCharsMatcher = UNWANTED_END_CHAR_PATTERN.matcher(number); if (trailingCharsMatcher.find()) { number = number.subSequence(0, trailingCharsMatcher.start()); - logger.log(Level.FINER, "Stripped trailing characters: " + number); } // Check for extra numbers at the end. Matcher secondNumber = SECOND_NUMBER_START_PATTERN.matcher(number); @@ -2290,9 +2289,7 @@ public class PhoneNumberUtil { int countryCode = number.getCountryCode(); List regions = countryCallingCodeToRegionCodeMap.get(countryCode); if (regions == null) { - String numberString = getNationalSignificantNumber(number); - logger.log(Level.INFO, - "Missing/invalid country_code (" + countryCode + ") for number " + numberString); + logger.log(Level.INFO, "Missing/invalid country_code (" + countryCode + ")"); return null; } if (regions.size() == 1) { @@ -2481,9 +2478,7 @@ public class PhoneNumberUtil { /** * Helper method to check a number against possible lengths for this region, based on the metadata - * being passed in, and determine whether it matches, or is too short or too long. Currently, if a - * number pattern suggests that numbers of length 7 and 10 are possible, and a number in between - * these possible lengths is entered, such as of length 8, this will return TOO_LONG. + * being passed in, and determine whether it matches, or is too short or too long. */ private ValidationResult testNumberLength(CharSequence number, PhoneMetadata metadata) { return testNumberLength(number, metadata, PhoneNumberType.UNKNOWN); @@ -2491,9 +2486,7 @@ public class PhoneNumberUtil { /** * Helper method to check a number against possible lengths for this number type, and determine - * whether it matches, or is too short or too long. Currently, if a number pattern suggests that - * numbers of length 7 and 10 are possible, and a number in between these possible lengths is - * entered, such as of length 8, this will return TOO_LONG. + * whether it matches, or is too short or too long. */ private ValidationResult testNumberLength( CharSequence number, PhoneMetadata metadata, PhoneNumberType type) { @@ -3225,7 +3218,10 @@ public class PhoneNumberUtil { // We require that the NSN remaining after stripping the national prefix and carrier code be // long enough to be a possible length for the region. Otherwise, we don't do the stripping, // since the original number could be a valid short number. - if (testNumberLength(potentialNationalNumber, regionMetadata) != ValidationResult.TOO_SHORT) { + ValidationResult validationResult = testNumberLength(potentialNationalNumber, regionMetadata); + if (validationResult != ValidationResult.TOO_SHORT + && validationResult != ValidationResult.IS_POSSIBLE_LOCAL_ONLY + && validationResult != ValidationResult.INVALID_LENGTH) { normalizedNationalNumber = potentialNationalNumber; if (keepRawInput && carrierCode.length() > 0) { phoneNumber.setPreferredDomesticCarrierCode(carrierCode.toString()); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX index 9e97b5cb..423ed2e3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF index 224f14d5..22eed1b6 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG index fa026d43..5bfd258a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM index de708dfd..7b12358d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG index 8b833d25..737d4b9b 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI index c3163f8f..7a24b87e 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN index ce1b0315..0ed0d151 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR index 8dfdc3a6..84f6d85a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY index 70b72dc5..a7b2cc83 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ index d21181a9..d87e96c3 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC index c9027ffe..db99baec 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT index 3fe34f80..2ad7c361 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI index be50f852..1aa1fc66 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL index 1ff6a367..2942a238 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU index 10255c85..1da99921 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ index de370239..5b992a90 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH index 0c2ddf9d..02ea0361 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US index 6bbac96c..ea08868a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC index a88b32cf..0d39a44f 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC and b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA index 94700edb..6b4ded3d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR index 06318b6f..b138cfee 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL index 47c5e47f..c683366d 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU index 80ec9e96..37cf725a 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH index 072173c3..28988480 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH differ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA index e993f7c5..854666a2 100644 Binary files a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA and b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA differ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index cc5e325a..5da7e9c9 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -2121,6 +2121,13 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { PhoneNumber shortNumber = new PhoneNumber(); shortNumber.setCountryCode(64).setNationalNumber(12L); assertEquals(shortNumber, phoneUtil.parse("12", RegionCode.NZ)); + + // Test for short-code with leading zero for a country which has 0 as national prefix. Ensure + // it's not interpreted as national prefix if the remaining number length is local-only in + // terms of length. Example: In GB, length 6-7 are only possible local-only. + shortNumber.setCountryCode(44).setNationalNumber(123456) + .setItalianLeadingZero(true); + assertEquals(shortNumber, phoneUtil.parse("0123456", RegionCode.GB)); } public void testParseNumberWithAlphaCharacters() throws Exception { -- cgit v1.2.3