diff options
author | Paul Duffin <paulduffin@google.com> | 2016-09-21 11:11:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-21 11:11:13 +0000 |
commit | c34dc740c4e3d4e6798d47ca172246b83743f9a0 (patch) | |
tree | dcd4d8079e9465432536b46d12c18810ede3f554 | |
parent | 444b6caeb53aaec736cba729c2445d885a56cb38 (diff) | |
parent | 78b57ad8097f172cc084be1b15ee6d2fe446c79c (diff) | |
download | libphonenumber-c34dc740c4e3d4e6798d47ca172246b83743f9a0.tar.gz |
Merge "Upgrade to libphonenumber-7.7.0 which is nano proto free"
am: 78b57ad809
Change-Id: I318faf2eff92a4c0bf1bd0ddd3fc0c51abc551de
683 files changed, 2046 insertions, 1675 deletions
@@ -57,7 +57,6 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -69,7 +68,6 @@ LOCAL_SRC_FILES := $(libphonenumber_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_resource_dirs) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := 9 -LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -84,6 +82,6 @@ LOCAL_SRC_FILES := $(libphonenumber_test_files) LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_test_resource_dirs) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber libprotobuf-java-nano +LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/README.version b/README.version index 1cd4978b..9eb1b43b 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,3 @@ -URL: https://github.com/googlei18n/libphonenumber/archive/libphonenumber-7.0.2.tar.gz -Version: 7.0.2 +URL: https://github.com/googlei18n/libphonenumber/archive/libphonenumber-7.7.0.tar.gz +Version: 7.7.0 BugComponent: 24949 @@ -45,21 +45,6 @@ </exec> </target> - <target name="build-single-file-phone-metadata"> - <exec executable="java"> - <arg value="-jar" /> - <arg value="${build.tools.jar}"/> - <arg value="BuildMetadataProtoFromXml"/> - <arg value="--input-file=${resources.dir}/PhoneNumberMetadata.xml"/> - <arg value="--output-dir=${libphonenumber.src.dir}/com/google/i18n/phonenumbers"/> - <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProto"/> - <arg value="--single-file=true"/> - <arg value="--mapping-class=CountryCodeToRegionCodeMap"/> - <arg value="--copyright=2010"/> - <arg value="--lite-build=false"/> - </exec> - </target> - <target name="build-short-metadata"> <exec executable="java"> <arg value="-jar" /> @@ -88,21 +73,6 @@ </exec> </target> - <target name="build-single-file-test-metadata"> - <exec executable="java"> - <arg value="-jar" /> - <arg value="${build.tools.jar}"/> - <arg value="BuildMetadataProtoFromXml"/> - <arg value="--input-file=${resources.dir}/PhoneNumberMetadataForTesting.xml"/> - <arg value="--output-dir=${libphonenumber.test.dir}/com/google/i18n/phonenumbers"/> - <arg value="--data-prefix=data/SingleFilePhoneNumberMetadataProtoForTesting"/> - <arg value="--single-file=true"/> - <arg value="--mapping-class=CountryCodeToRegionCodeMapForTesting"/> - <arg value="--copyright=2010"/> - <arg value="--lite-build=false"/> - </exec> - </target> - <target name="build-alternate-metadata"> <exec executable="java"> <arg value="-jar" /> diff --git a/carrier/pom.xml b/carrier/pom.xml index 7fd8faa0..cc18d94b 100644 --- a/carrier/pom.xml +++ b/carrier/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.26</version> + <version>1.43</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </parent> <build> @@ -28,18 +28,40 @@ <targetPath>com/google/i18n/phonenumbers/carrier/testing_data</targetPath> </testResource> </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java15</artifactId> + <version>1.0</version> + </signature> + </configuration> + </plugin> + </plugins> </build> <dependencies> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.36</version> + <version>2.53</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en Binary files differindex abc75c67..41514899 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en Binary files differindex 04ebce54..5ed31600 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en Binary files differindex 1845987b..63e5fa0e 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en Binary files differindex ac0d4acc..ffd1089b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en Binary files differindex 2a208a92..a2a10397 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en Binary files differindex 34bdc17b..0ff477db 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/243_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en Binary files differindex 397b8849..0f5394a6 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en Binary files differindex ba7b00d1..432ae99b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en Binary files differindex 9a600ed5..fea08ad6 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en Binary files differindex ea1a183d..51be629d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en Binary files differindex d8ee91b6..18b085fa 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en Binary files differindex 5a9033fc..60a12aa4 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru Binary files differnew file mode 100644 index 00000000..71427992 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/382_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/382_en Binary files differnew file mode 100644 index 00000000..0bcfed37 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/382_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en Binary files differindex 75f4d40c..1a1cae93 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en Binary files differindex c0255289..6ff22094 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en Binary files differindex 2985cc00..21017a63 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/66_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en Binary files differindex 51bed889..c0859642 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/677_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en Binary files differindex 5296d9d3..af53f1b8 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/84_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh Binary files differnew file mode 100644 index 00000000..ac7be2b5 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant Binary files differnew file mode 100644 index 00000000..a07076a6 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh_Hant diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en Binary files differindex 1e5acc80..5953b117 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en Binary files differindex 9acebb84..85e5133e 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en Binary files differindex 574cd573..15379c3b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh Binary files differnew file mode 100644 index 00000000..92132e63 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant Binary files differnew file mode 100644 index 00000000..64702afe --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en Binary files differindex 3250d045..5891a0fd 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_fa Binary files differnew file mode 100644 index 00000000..5bc8e68c --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_fa diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en Binary files differnew file mode 100644 index 00000000..0426ab43 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en Binary files differindex d5736073..c6354778 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/968_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/971_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/971_en Binary files differindex bc897cac..80751d01 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/971_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/971_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en Binary files differindex 62d54b5e..49fe22dd 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en Binary files differindex 0a4e1d0d..4c8551d2 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/973_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa Binary files differnew file mode 100644 index 00000000..fba7acae --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en Binary files differindex d1307eb0..f9568f85 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en Binary files differindex 6d3de757..2594797a 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/994_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config Binary files differindex b7f95b56..4a4e6e44 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config diff --git a/demo/pom.xml b/demo/pom.xml index 07eeba4a..90072bf6 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,11 +4,11 @@ <parent> <artifactId>libphonenumber-parent</artifactId> <groupId>com.googlecode.libphonenumber</groupId> - <version>7.2.6</version> + <version>7.7.0</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> <properties> <gae.version>1.9.32</gae.version> @@ -31,7 +31,7 @@ <version>2.5</version> </dependency> <dependency> - <groupId>org.apache.commons</groupId> + <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>1.3.2</version> </dependency> @@ -48,17 +48,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.36</version> + <version>2.53</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.26</version> + <version>1.43</version> </dependency> </dependencies> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index a3455821..99030c12 100644 --- a/geocoder/pom.xml +++ b/geocoder/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.36</version> + <version>2.53</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </parent> <build> @@ -36,18 +36,40 @@ <targetPath>com/google/i18n/phonenumbers/timezones/testing_data</targetPath> </testResource> </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java15</artifactId> + <version>1.0</version> + </signature> + </configuration> + </plugin> + </plugins> </build> <dependencies> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.36</version> + <version>2.53</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java index 5642a11d..f4dc6aad 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java @@ -186,7 +186,7 @@ public class PhoneNumberOfflineGeocoder { PhoneNumberType numberType = phoneUtil.getNumberType(number); if (numberType == PhoneNumberType.UNKNOWN) { return ""; - } else if (!canBeGeocoded(numberType)) { + } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) { return getCountryNameForNumber(number, languageCode); } return getDescriptionForValidNumber(number, languageCode); @@ -209,20 +209,9 @@ public class PhoneNumberOfflineGeocoder { PhoneNumberType numberType = phoneUtil.getNumberType(number); if (numberType == PhoneNumberType.UNKNOWN) { return ""; - } else if (!canBeGeocoded(numberType)) { + } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) { return getCountryNameForNumber(number, languageCode); } return getDescriptionForValidNumber(number, languageCode, userRegion); } - - /** - * A similar method is implemented as PhoneNumberUtil.isNumberGeographical, which performs a - * stricter check, as it determines if a number has a geographical association. Also, if new - * phone number types were added, we should check if this other method should be updated too. - */ - private boolean canBeGeocoded(PhoneNumberType numberType) { - return (numberType == PhoneNumberType.FIXED_LINE || - numberType == PhoneNumberType.MOBILE || - numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE); - } } diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en Binary files differnew file mode 100644 index 00000000..cf1636a3 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en Binary files differnew file mode 100644 index 00000000..29a919a9 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en Binary files differnew file mode 100644 index 00000000..24bb0114 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en Binary files differnew file mode 100644 index 00000000..0856e342 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en Binary files differindex fa71451d..2ae8176b 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en Binary files differnew file mode 100644 index 00000000..06efda86 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en Binary files differindex e389d1c3..6da6432d 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en Binary files differindex 3b413f6e..1b187606 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en Binary files differindex 39d41a0a..b99be333 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en Binary files differindex 5273f0e7..5ad7e32d 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en Binary files differindex 3a2d306a..2dd3e791 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en Binary files differnew file mode 100644 index 00000000..dbf547da --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en Binary files differnew file mode 100644 index 00000000..24aedf80 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en Binary files differindex 61697eb3..054d2132 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt Binary files differnew file mode 100644 index 00000000..6e927ccd --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg Binary files differnew file mode 100644 index 00000000..0f3c055a --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca Binary files differnew file mode 100644 index 00000000..243c0a23 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el Binary files differnew file mode 100644 index 00000000..48d7608f --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es Binary files differnew file mode 100644 index 00000000..3d8653aa --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi Binary files differnew file mode 100644 index 00000000..b7348e92 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi Binary files differnew file mode 100644 index 00000000..1fbe4064 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu Binary files differnew file mode 100644 index 00000000..96ca9943 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw Binary files differnew file mode 100644 index 00000000..715f8f05 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja Binary files differnew file mode 100644 index 00000000..d559b043 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl Binary files differnew file mode 100644 index 00000000..440ff0e3 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt Binary files differnew file mode 100644 index 00000000..c89b1b40 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro Binary files differnew file mode 100644 index 00000000..82606acb --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru Binary files differnew file mode 100644 index 00000000..e94b0d76 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl Binary files differnew file mode 100644 index 00000000..e083afe2 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr Binary files differnew file mode 100644 index 00000000..ae96047f --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr Binary files differnew file mode 100644 index 00000000..3fe43841 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk Binary files differnew file mode 100644 index 00000000..7f1676af --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi Binary files differnew file mode 100644 index 00000000..0221acdf --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en Binary files differindex 52217295..28501b90 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en Binary files differindex ec13539e..ca85eca2 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh Binary files differindex 6519ec58..84f72fa0 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en Binary files differindex 0b87cd9d..06551ca1 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en Binary files differnew file mode 100644 index 00000000..3c179c71 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa Binary files differnew file mode 100644 index 00000000..19c76fd4 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en Binary files differindex e6995f46..2d8f8f75 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa Binary files differindex 00da41f7..19206f80 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en Binary files differnew file mode 100644 index 00000000..7bdce26e --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en Binary files differnew file mode 100644 index 00000000..69468e9e --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config Binary files differindex 591c591b..7b3822ce 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data Binary files differindex f8a5045c..08d7a6d2 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data +++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java index ed9bd3b0..082a759a 100644 --- a/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java +++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoderTest.java @@ -41,6 +41,8 @@ public class PhoneNumberOfflineGeocoderTest extends TestCase { new PhoneNumber().setCountryCode(82).setNationalNumber(6421234567L); private static final PhoneNumber KO_INVALID_NUMBER = new PhoneNumber().setCountryCode(82).setNationalNumber(1234L); + private static final PhoneNumber KO_MOBILE = + new PhoneNumber().setCountryCode(82).setNationalNumber(101234567L); private static final PhoneNumber US_NUMBER1 = new PhoneNumber().setCountryCode(1).setNationalNumber(6502530000L); private static final PhoneNumber US_NUMBER2 = @@ -160,4 +162,9 @@ public class PhoneNumberOfflineGeocoderTest extends TestCase { assertEquals("", geocoder.getDescriptionForNumber(KO_INVALID_NUMBER, Locale.ENGLISH)); assertEquals("", geocoder.getDescriptionForNumber(US_INVALID_NUMBER, Locale.ENGLISH)); } + + public void testGetDescriptionForNonGeographicalNumberWithGeocodingPrefix() { + // We have a geocoding prefix, but we shouldn't use it since this is not geographical. + assertEquals("South Korea", geocoder.getDescriptionForNumber(KO_MOBILE, Locale.ENGLISH)); + } } diff --git a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en Binary files differindex cd18ecbf..8d139609 100644 --- a/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en +++ b/geocoder/test/com/google/i18n/phonenumbers/geocoding/testing_data/82_en diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 3d86d551..f9ba2fb1 100644 --- a/internal/prefixmapper/pom.xml +++ b/internal/prefixmapper/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.36</version> + <version>2.53</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -23,13 +23,35 @@ <targetPath>com/google/i18n/phonenumbers/geocoding/testing_data</targetPath> </testResource> </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java15</artifactId> + <version>1.0</version> + </signature> + </configuration> + </plugin> + </plugins> </build> <dependencies> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </dependency> </dependencies> diff --git a/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar b/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar Binary files differdeleted file mode 100644 index 669e6728..00000000 --- a/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar +++ /dev/null diff --git a/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom b/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom deleted file mode 100644 index a9f88e00..00000000 --- a/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.6.1</version> - <description>POM was created from install:install-file</description> -</project> diff --git a/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml b/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml deleted file mode 100644 index fdb85172..00000000 --- a/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<metadata> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <versioning> - <release>2.6.1</release> - <versions> - <version>2.6.1</version> - </versions> - <lastUpdated>20151102180249</lastUpdated> - </versioning> -</metadata> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 82446bcc..608ab88b 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> </parent> <build> @@ -30,41 +30,26 @@ </testResources> <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.class</exclude> - <exclude>com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-shade-plugin</artifactId> - <version>2.4.2</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> <executions> <execution> - <phase>package</phase> + <phase>test</phase> <goals> - <goal>shade</goal> + <goal>check</goal> </goals> </execution> </executions> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java15</artifactId> + <version>1.0</version> + </signature> + </configuration> </plugin> </plugins> </build> - <repositories> - <repository> - <id>protobuf-java-lib</id> - <url>file://${project.basedir}/../lib</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>com.google.protobuf</groupId> - <artifactId>protobuf-java</artifactId> - <version>2.6.1</version> - </dependency> - </dependencies> - </project> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index 6af473e6..abcab8d5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -16,8 +16,8 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import java.util.ArrayList; import java.util.Iterator; @@ -61,11 +61,8 @@ public class AsYouTypeFormatter { // Character used when appropriate to separate a prefix, such as a long NDD or a country calling // code, from the national number. private static final char SEPARATOR_BEFORE_NATIONAL_NUMBER = ' '; - private static final PhoneMetadata EMPTY_METADATA; - static { - EMPTY_METADATA = new PhoneMetadata(); - EMPTY_METADATA.internationalPrefix = "NA"; - } + private static final PhoneMetadata EMPTY_METADATA = + new PhoneMetadata().setInternationalPrefix("NA"); private PhoneMetadata defaultMetadata; private PhoneMetadata currentMetadata; @@ -154,7 +151,7 @@ public class AsYouTypeFormatter { Iterator<NumberFormat> it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat numberFormat = it.next(); - String pattern = numberFormat.pattern; + String pattern = numberFormat.getPattern(); if (currentFormattingPattern.equals(pattern)) { return false; } @@ -162,7 +159,7 @@ public class AsYouTypeFormatter { currentFormattingPattern = pattern; shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.nationalPrefixFormattingRule).find(); + numberFormat.getNationalPrefixFormattingRule()).find(); // With a new formatting template, the matched position using the old template needs to be // reset. lastMatchPosition = 0; @@ -176,17 +173,17 @@ public class AsYouTypeFormatter { } private void getAvailableFormats(String leadingDigits) { - NumberFormat[] numberFormats = - (isCompleteNumber && currentMetadata.intlNumberFormat.length > 0) - ? currentMetadata.intlNumberFormat - : currentMetadata.numberFormat; - boolean nationalPrefixIsUsedByCountry = (!currentMetadata.nationalPrefix.equals("")); - for (NumberFormat format : numberFormats) { + List<NumberFormat> formatList = + (isCompleteNumber && currentMetadata.intlNumberFormatSize() > 0) + ? currentMetadata.intlNumberFormats() + : currentMetadata.numberFormats(); + boolean nationalPrefixIsUsedByCountry = currentMetadata.hasNationalPrefix(); + for (NumberFormat format : formatList) { if (!nationalPrefixIsUsedByCountry || isCompleteNumber || - format.nationalPrefixOptionalWhenFormatting || + format.isNationalPrefixOptionalWhenFormatting() || PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - format.nationalPrefixFormattingRule)) { - if (isFormatEligible(format.format)) { + format.getNationalPrefixFormattingRule())) { + if (isFormatEligible(format.getFormat())) { possibleFormats.add(format); } } @@ -203,14 +200,14 @@ public class AsYouTypeFormatter { Iterator<NumberFormat> it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat format = it.next(); - if (format.leadingDigitsPattern.length == 0) { + if (format.leadingDigitsPatternSize() == 0) { // Keep everything that isn't restricted by leading digits. continue; } int lastLeadingDigitsPattern = - Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPattern.length - 1); + Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1); Pattern leadingDigitsPattern = regexCache.getPatternForRegex( - format.leadingDigitsPattern[lastLeadingDigitsPattern]); + format.getLeadingDigitsPattern(lastLeadingDigitsPattern)); Matcher m = leadingDigitsPattern.matcher(leadingDigits); if (!m.lookingAt()) { it.remove(); @@ -219,7 +216,7 @@ public class AsYouTypeFormatter { } private boolean createFormattingTemplate(NumberFormat format) { - String numberPattern = format.pattern; + String numberPattern = format.getPattern(); // The formatter doesn't format numbers when numberPattern contains "|", e.g. // (20|3)\d{4}. In those cases we quickly return. @@ -233,7 +230,7 @@ public class AsYouTypeFormatter { // Replace any standalone digit (not the one in d{}) with \d numberPattern = STANDALONE_DIGIT_PATTERN.matcher(numberPattern).replaceAll("\\\\d"); formattingTemplate.setLength(0); - String tempTemplate = getFormattingTemplate(numberPattern, format.format); + String tempTemplate = getFormattingTemplate(numberPattern, format.getFormat()); if (tempTemplate.length() > 0) { formattingTemplate.append(tempTemplate); return true; @@ -431,12 +428,12 @@ public class AsYouTypeFormatter { */ String attemptToFormatAccruedDigits() { for (NumberFormat numberFormat : possibleFormats) { - Matcher m = regexCache.getPatternForRegex(numberFormat.pattern).matcher(nationalNumber); + Matcher m = regexCache.getPatternForRegex(numberFormat.getPattern()).matcher(nationalNumber); if (m.matches()) { shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.nationalPrefixFormattingRule).find(); - String formattedNumber = m.replaceAll(numberFormat.format); + numberFormat.getNationalPrefixFormattingRule()).find(); + String formattedNumber = m.replaceAll(numberFormat.getFormat()); return appendNationalNumber(formattedNumber); } } @@ -529,7 +526,7 @@ public class AsYouTypeFormatter { // that national significant numbers in NANPA always start with [2-9] after the national prefix. // Numbers beginning with 1[01] can only be short/emergency numbers, which don't need the // national prefix. - return (currentMetadata.countryCode == 1) && (nationalNumber.charAt(0) == '1') && + return (currentMetadata.getCountryCode() == 1) && (nationalNumber.charAt(0) == '1') && (nationalNumber.charAt(1) != '0') && (nationalNumber.charAt(1) != '1'); } @@ -540,9 +537,9 @@ public class AsYouTypeFormatter { startOfNationalNumber = 1; prefixBeforeNationalNumber.append('1').append(SEPARATOR_BEFORE_NATIONAL_NUMBER); isCompleteNumber = true; - } else if (!currentMetadata.nationalPrefixForParsing.equals("")) { + } else if (currentMetadata.hasNationalPrefixForParsing()) { Pattern nationalPrefixForParsing = - regexCache.getPatternForRegex(currentMetadata.nationalPrefixForParsing); + regexCache.getPatternForRegex(currentMetadata.getNationalPrefixForParsing()); Matcher m = nationalPrefixForParsing.matcher(nationalNumber); // Since some national prefix patterns are entirely optional, check that a national prefix // could actually be extracted. @@ -570,7 +567,7 @@ public class AsYouTypeFormatter { private boolean attemptToExtractIdd() { Pattern internationalPrefix = regexCache.getPatternForRegex("\\" + PhoneNumberUtil.PLUS_SIGN + "|" + - currentMetadata.internationalPrefix); + currentMetadata.getInternationalPrefix()); Matcher iddMatcher = internationalPrefix.matcher(accruedInputWithoutFormatting); if (iddMatcher.lookingAt()) { isCompleteNumber = true; diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java index 1ab3e931..9904bcda 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataLoader.java @@ -23,7 +23,8 @@ import java.io.InputStream; */ public interface MetadataLoader { /** - * Returns an input stream corresponding to the metadata to load. + * Returns an input stream corresponding to the metadata to load. This method may be called + * concurrently so implementations must be thread-safe. * * @param metadataFileName File name (including path) of metadata to load. File path is an * absolute class path like /com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto. diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java index 0d998c75..df72a608 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java @@ -16,16 +16,16 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; -import com.google.protobuf.nano.CodedInputByteBufferNano; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; @@ -36,13 +36,13 @@ import java.util.logging.Logger; * additional data files such as PhoneNumberAlternateFormats, but in the future it is envisaged it * would handle the main metadata file (PhoneNumberMetadata.xml) as well. */ -class MetadataManager { +final class MetadataManager { private static final String ALTERNATE_FORMATS_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto"; private static final String SHORT_NUMBER_METADATA_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto"; - private static final Logger LOGGER = Logger.getLogger(MetadataManager.class.getName()); + private static final Logger logger = Logger.getLogger(MetadataManager.class.getName()); private static final Map<Integer, PhoneMetadata> callingCodeToAlternateFormatsMap = Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>()); @@ -61,50 +61,52 @@ class MetadataManager { private MetadataManager() { } - private static void close(InputStream in) { - if (in != null) { + /** + * Loads and returns the metadata object from the given stream and closes the stream. + * + * @param source the non-null stream from which metadata is to be read + * @return the loaded metadata object + */ + static PhoneMetadataCollection loadMetadataAndCloseInput(InputStream source) { + ObjectInputStream ois = null; + try { try { - in.close(); + ois = new ObjectInputStream(source); } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); + throw new RuntimeException("cannot load/parse metadata", e); + } + PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); + try { + metadataCollection.readExternal(ois); + } catch (IOException e) { + throw new RuntimeException("cannot load/parse metadata", e); + } + return metadataCollection; + } finally { + try { + if (ois != null) { + // This will close all underlying streams as well, including source. + ois.close(); + } else { + source.close(); + } + } catch (IOException e) { + logger.log(Level.WARNING, "error closing input stream (ignored)", e); } } } - // The size of the byte buffer used for deserializing the alternate formats and short number - // metadata files for each region. - private static final int BUFFER_SIZE = 16 * 1024; - - static CodedInputByteBufferNano convertStreamToByteBuffer(ObjectInputStream in, int bufferSize) - throws IOException { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - int nRead; - byte[] data = new byte[bufferSize]; - - while ((nRead = in.read(data, 0, bufferSize)) != -1) { - outputStream.write(data, 0, nRead); - } - - outputStream.flush(); - return CodedInputByteBufferNano.newInstance(outputStream.toByteArray()); - } - private static void loadAlternateFormatsMetadataFromFile(int countryCallingCode) { - InputStream source = PhoneNumberMatcher.class.getResourceAsStream( - ALTERNATE_FORMATS_FILE_PREFIX + "_" + countryCallingCode); - ObjectInputStream in = null; - try { - in = new ObjectInputStream(source); - CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE); - PhoneMetadataCollection alternateFormats = new PhoneMetadataCollection(); - alternateFormats.mergeFrom(byteBuffer); - for (PhoneMetadata metadata : alternateFormats.metadata) { - callingCodeToAlternateFormatsMap.put(metadata.countryCode, metadata); - } - } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); - } finally { - close(in); + String fileName = ALTERNATE_FORMATS_FILE_PREFIX + "_" + countryCallingCode; + InputStream source = MetadataManager.class.getResourceAsStream(fileName); + if (source == null) { + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. + throw new IllegalStateException("missing metadata: " + fileName); + } + PhoneMetadataCollection alternateFormats = loadMetadataAndCloseInput(source); + for (PhoneMetadata metadata : alternateFormats.getMetadataList()) { + callingCodeToAlternateFormatsMap.put(metadata.getCountryCode(), metadata); } } @@ -121,21 +123,16 @@ class MetadataManager { } private static void loadShortNumberMetadataFromFile(String regionCode) { - InputStream source = PhoneNumberMatcher.class.getResourceAsStream( - SHORT_NUMBER_METADATA_FILE_PREFIX + "_" + regionCode); - ObjectInputStream in = null; - try { - in = new ObjectInputStream(source); - CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE); - PhoneMetadataCollection shortNumberMetadata = new PhoneMetadataCollection(); - shortNumberMetadata.mergeFrom(byteBuffer); - for (PhoneMetadata metadata : shortNumberMetadata.metadata) { - regionCodeToShortNumberMetadataMap.put(regionCode, metadata); - } - } catch (IOException e) { - LOGGER.log(Level.WARNING, e.toString()); - } finally { - close(in); + String fileName = SHORT_NUMBER_METADATA_FILE_PREFIX + "_" + regionCode; + InputStream source = MetadataManager.class.getResourceAsStream(fileName); + if (source == null) { + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. + throw new IllegalStateException("missing metadata: " + fileName); + } + PhoneMetadataCollection shortNumberMetadata = loadMetadataAndCloseInput(source); + for (PhoneMetadata metadata : shortNumberMetadata.getMetadataList()) { + regionCodeToShortNumberMetadataMap.put(regionCode, metadata); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java index 018ff3da..d0ec50df 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; /** * A source for phone metadata for all regions. diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java index 4f6b29da..d89052c8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -16,16 +16,16 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -41,18 +41,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto"; // A mapping from a region code to the PhoneMetadata for that region. - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map<String, PhoneMetadata> regionToMetadataMap = - Collections.synchronizedMap(new HashMap<String, PhoneMetadata>()); + private final ConcurrentHashMap<String, PhoneMetadata> geographicalRegions = + new ConcurrentHashMap<String, PhoneMetadata>(); // A mapping from a country calling code for a non-geographical entity to the PhoneMetadata for // that country calling code. Examples of the country calling codes include 800 (International // Toll Free Service) and 808 (International Shared Cost Service). - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map<Integer, PhoneMetadata> countryCodeToNonGeographicalMetadataMap = - Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>()); + private final ConcurrentHashMap<Integer, PhoneMetadata> nonGeographicalRegions = + new ConcurrentHashMap<Integer, PhoneMetadata>(); // The prefix of the metadata files from which region data is loaded. private final String filePrefix; @@ -60,104 +56,81 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { // The metadata loader used to inject alternative metadata sources. private final MetadataLoader metadataLoader; - // It is assumed that metadataLoader is not null. - public MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) { + // It is assumed that metadataLoader is not null. If needed, checks should happen before passing + // here. + // @VisibleForTesting + MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) { this.filePrefix = filePrefix; this.metadataLoader = metadataLoader; } - // It is assumed that metadataLoader is not null. + // It is assumed that metadataLoader is not null. If needed, checks should happen before passing + // here. public MultiFileMetadataSourceImpl(MetadataLoader metadataLoader) { this(META_DATA_FILE_PREFIX, metadataLoader); } @Override public PhoneMetadata getMetadataForRegion(String regionCode) { - synchronized (regionToMetadataMap) { - if (!regionToMetadataMap.containsKey(regionCode)) { - // The regionCode here will be valid and won't be '001', so we don't need to worry about - // what to pass in for the country calling code. - loadMetadataFromFile(regionCode, 0); - } - } - return regionToMetadataMap.get(regionCode); + PhoneMetadata metadata = geographicalRegions.get(regionCode); + return (metadata != null) ? metadata : loadMetadataFromFile( + regionCode, geographicalRegions, filePrefix, metadataLoader); } @Override public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { - synchronized (countryCodeToNonGeographicalMetadataMap) { - if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - List<String> regionCodes = - CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap().get(countryCallingCode); - // We can assume that if the country calling code maps to the non-geo entity region code - // then that's the only region code it maps to. - if (regionCodes.size() == 1 && - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))) { - loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode); - } - } + PhoneMetadata metadata = nonGeographicalRegions.get(countryCallingCode); + if (metadata != null) { + return metadata; + } + if (isNonGeographical(countryCallingCode)) { + return loadMetadataFromFile( + countryCallingCode, nonGeographicalRegions, filePrefix, metadataLoader); } - return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); + // The given country calling code was for a geographical region. + return null; } + // A country calling code is non-geographical if it only maps to the non-geographical region code, + // i.e. "001". + private boolean isNonGeographical(int countryCallingCode) { + List<String> regionCodes = + CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap().get(countryCallingCode); + return (regionCodes.size() == 1 + && PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))); + } + + /** + * @param key The geographical region code or the non-geographical region's country + * calling code. + * @param map The map to contain the mapping from {@code key} to the corresponding + * metadata. + * @param filePrefix The prefix of the metadata files from which region data is loaded. + * @param metadataLoader The metadata loader used to inject alternative metadata sources. + */ // @VisibleForTesting - void loadMetadataFromFile(String regionCode, int countryCallingCode) { - boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); - String fileName = filePrefix + "_" + - (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); + static <T> PhoneMetadata loadMetadataFromFile( + T key, ConcurrentHashMap<T, PhoneMetadata> map, String filePrefix, + MetadataLoader metadataLoader) { + // We assume key.toString() is well-defined. + String fileName = filePrefix + "_" + key; InputStream source = metadataLoader.loadMetadata(fileName); if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); + // Sanity check; this should not happen since we only load things based on the expectation + // that they are present, by checking the map of available data first. throw new IllegalStateException("missing metadata: " + fileName); } - try { - PhoneMetadataCollection metadataCollection = - loadMetadataAndCloseInput(new ObjectInputStream(source)); - PhoneMetadata[] metadataList = metadataCollection.metadata; - if (metadataList.length == 0) { - logger.log(Level.SEVERE, "empty metadata: " + fileName); - throw new IllegalStateException("empty metadata: " + fileName); - } - if (metadataList.length > 1) { - logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); - } - PhoneMetadata metadata = metadataList[0]; - if (isNonGeoRegion) { - countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); - } else { - regionToMetadataMap.put(regionCode, metadata); - } - } catch (IOException e) { - logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); - throw new RuntimeException("cannot load/parse metadata: " + fileName, e); + PhoneMetadataCollection metadataCollection = MetadataManager.loadMetadataAndCloseInput(source); + List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { + // Sanity check; this should not happen since we build with non-empty metadata. + throw new IllegalStateException("empty metadata: " + fileName); } - } - - /** - * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any - * exceptions that occur while reading or closing the stream are ignored. - * - * @param source the non-null stream from which metadata is to be read. - * @return the loaded metadata protocol buffer. - */ - private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { - // The size of the byte buffer used for deserializing the phone number metadata files for each - // region. - final int MULTI_FILE_BUFFER_SIZE = 16 * 1024; - - PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); - try { - metadataCollection.mergeFrom( - MetadataManager.convertStreamToByteBuffer(source, MULTI_FILE_BUFFER_SIZE)); - } catch (IOException e) { - logger.log(Level.WARNING, "error reading input (ignored)", e); - } finally { - try { - source.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } + if (metadataList.size() > 1) { + logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); } - return metadataCollection; + PhoneMetadata metadata = metadataList.get(0); + PhoneMetadata oldValue = map.putIfAbsent(key, metadata); + return (oldValue != null) ? oldValue : metadata; } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java index a9d918f2..c74b21ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatcher.java @@ -19,10 +19,10 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.Leniency; import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.lang.Character.UnicodeBlock; import java.util.Iterator; @@ -585,7 +585,7 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { PhoneMetadata alternateFormats = MetadataManager.getAlternateFormatsForCountry(number.getCountryCode()); if (alternateFormats != null) { - for (NumberFormat alternateFormat : alternateFormats.numberFormat) { + for (NumberFormat alternateFormat : alternateFormats.numberFormats()) { formattedNumberGroups = getNationalNumberGroups(util, number, alternateFormat); if (checker.checkGroups(util, number, normalizedCandidate, formattedNumberGroups)) { return true; @@ -665,17 +665,17 @@ final class PhoneNumberMatcher implements Iterator<PhoneNumberMatch> { // Check if a national prefix should be present when formatting this number. String nationalNumber = util.getNationalSignificantNumber(number); NumberFormat formatRule = - util.chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + util.chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); // To do this, we check that a national prefix formatting rule was present and that it wasn't // just the first-group symbol ($1) with punctuation. - if ((formatRule != null) && formatRule.nationalPrefixFormattingRule.length() > 0) { - if (formatRule.nationalPrefixOptionalWhenFormatting) { + if ((formatRule != null) && formatRule.getNationalPrefixFormattingRule().length() > 0) { + if (formatRule.isNationalPrefixOptionalWhenFormatting()) { // The national-prefix is optional in these cases, so we don't need to check if it was // present. return true; } if (PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - formatRule.nationalPrefixFormattingRule)) { + formatRule.getNationalPrefixFormattingRule())) { // National Prefix not needed for this number. return true; } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 0a0e455f..5a41d761 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -16,11 +16,11 @@ package com.google.i18n.phonenumbers; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.io.InputStream; import java.util.ArrayList; @@ -88,6 +88,19 @@ public class PhoneNumberUtil { // be the length of the area code plus the length of the mobile token. private static final Map<Integer, String> MOBILE_TOKEN_MAPPINGS; + // Set of country codes that have geographically assigned mobile numbers (see GEO_MOBILE_COUNTRIES + // below) which are not based on *area codes*. For example, in China mobile numbers start with a + // carrier indicator, and beyond that are geographically assigned: this carrier indicator is not + // considered to be an area code. + private static final Set<Integer> GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES; + + // Set of country calling codes that have geographically assigned mobile numbers. This may not be + // complete; we add calling codes case by case, as we find geographical mobile numbers or hear + // from user reports. Note that countries like the US, where we can't distinguish between + // fixed-line or mobile numbers, are not listed here, since we consider FIXED_LINE_OR_MOBILE to be + // a possibly geographically-related type anyway (like FIXED_LINE). + private static final Set<Integer> GEO_MOBILE_COUNTRIES; + // The PLUS_SIGN signifies the international prefix. static final char PLUS_SIGN = '+'; @@ -119,6 +132,19 @@ public class PhoneNumberUtil { mobileTokenMap.put(54, "9"); MOBILE_TOKEN_MAPPINGS = Collections.unmodifiableMap(mobileTokenMap); + HashSet<Integer> geoMobileCountriesWithoutMobileAreaCodes = new HashSet<Integer>(); + geoMobileCountriesWithoutMobileAreaCodes.add(86); // China + GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES = + Collections.unmodifiableSet(geoMobileCountriesWithoutMobileAreaCodes); + + HashSet<Integer> geoMobileCountries = new HashSet<Integer>(); + geoMobileCountries.add(52); // Mexico + geoMobileCountries.add(54); // Argentina + geoMobileCountries.add(55); // Brazil + geoMobileCountries.add(62); // Indonesia: some prefixes only (fixed CMDA wireless) + geoMobileCountries.addAll(geoMobileCountriesWithoutMobileAreaCodes); + GEO_MOBILE_COUNTRIES = Collections.unmodifiableSet(geoMobileCountries); + // Simple ASCII digits map used to populate ALPHA_PHONE_MAPPINGS and // ALL_PLUS_NUMBER_GROUPING_SYMBOLS. HashMap<Character, Character> asciiDigitMappings = new HashMap<Character, Character>(); @@ -587,24 +613,6 @@ public class PhoneNumberUtil { } /** - * Returns a copy of the given NumberFormat object. - */ - static NumberFormat copyNumberFormat(NumberFormat other) { - NumberFormat copy = new NumberFormat(); - copy.pattern = other.pattern; - copy.format = other.format; - int leadingDigitsPatternSize = other.leadingDigitsPattern.length; - copy.leadingDigitsPattern = new String[leadingDigitsPatternSize]; - for (int i = 0; i < leadingDigitsPatternSize; i++) { - copy.leadingDigitsPattern[i] = other.leadingDigitsPattern[i]; - } - copy.nationalPrefixFormattingRule = other.nationalPrefixFormattingRule; - copy.domesticCarrierCodeFormattingRule = other.domesticCarrierCodeFormattingRule; - copy.nationalPrefixOptionalWhenFormatting = other.nationalPrefixOptionalWhenFormatting; - return copy; - } - - /** * Attempts to extract a possible number from the string passed in. This currently strips all * leading characters that cannot be used to start a phone number. Characters that can be used to * start a phone number are defined in the VALID_START_CHAR_PATTERN. If none of these characters @@ -787,11 +795,21 @@ public class PhoneNumberUtil { } // If a country doesn't use a national prefix, and this number doesn't have an Italian leading // zero, we assume it is a closed dialling plan with no area codes. - if (metadata.nationalPrefix.equals("") && !number.isItalianLeadingZero()) { + if (!metadata.hasNationalPrefix() && !number.isItalianLeadingZero()) { + return 0; + } + + PhoneNumberType type = getNumberType(number); + int countryCallingCode = number.getCountryCode(); + if (type == PhoneNumberType.MOBILE + // Note this is a rough heuristic; it doesn't cover Indonesia well, for example, where area + // codes are present for some mobile phones but not for others. We have no better way of + // representing this in the metadata at this point. + && GEO_MOBILE_COUNTRIES_WITHOUT_MOBILE_AREA_CODES.contains(countryCallingCode)) { return 0; } - if (!isNumberGeographical(number)) { + if (!isNumberGeographical(type, countryCallingCode)) { return 0; } @@ -1006,18 +1024,23 @@ public class PhoneNumberUtil { * Tests whether a phone number has a geographical association. It checks if the number is * associated to a certain region in the country where it belongs to. Note that this doesn't * verify if the number is actually in use. + */ + public boolean isNumberGeographical(PhoneNumber phoneNumber) { + return isNumberGeographical(getNumberType(phoneNumber), phoneNumber.getCountryCode()); + } + + /** + * Tests whether a phone number has a geographical association, as represented by its type and the + * country it belongs to. * - * A similar method is implemented as PhoneNumberOfflineGeocoder.canBeGeocoded, which performs a - * looser check, since it only prevents cases where prefixes overlap for geocodable and - * non-geocodable numbers. Also, if new phone number types were added, we should check if this - * other method should be updated too. + * This version of isNumberGeographical exists since calculating the phone number type is + * expensive; if we have already done this, we don't want to do it again. */ - boolean isNumberGeographical(PhoneNumber phoneNumber) { - PhoneNumberType numberType = getNumberType(phoneNumber); - // TODO: Include mobile phone numbers from countries like Indonesia, which has some - // mobile numbers that are geographical. - return numberType == PhoneNumberType.FIXED_LINE || - numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE; + public boolean isNumberGeographical(PhoneNumberType numberType, int countryCallingCode) { + return numberType == PhoneNumberType.FIXED_LINE + || numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE + || (GEO_MOBILE_COUNTRIES.contains(countryCallingCode) + && numberType == PhoneNumberType.MOBILE); } /** @@ -1131,29 +1154,29 @@ public class PhoneNumberUtil { StringBuilder formattedNumber = new StringBuilder(20); NumberFormat formattingPattern = - chooseFormattingPatternForNumber(userDefinedFormats.toArray( - new NumberFormat[userDefinedFormats.size()]), nationalSignificantNumber); + chooseFormattingPatternForNumber(userDefinedFormats, nationalSignificantNumber); if (formattingPattern == null) { // If no pattern above is matched, we format the number as a whole. formattedNumber.append(nationalSignificantNumber); } else { + NumberFormat numFormatCopy = new NumberFormat(); // Before we do a replacement of the national prefix pattern $NP with the national prefix, we // need to copy the rule so that subsequent replacements for different numbers have the // appropriate national prefix. - NumberFormat numFormatCopy = copyNumberFormat(formattingPattern); - String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; + numFormatCopy.mergeFrom(formattingPattern); + String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); if (nationalPrefixFormattingRule.length() > 0) { - String nationalPrefix = metadata.nationalPrefix; + String nationalPrefix = metadata.getNationalPrefix(); if (nationalPrefix.length() > 0) { // Replace $NP with national prefix and $FG with the first group ($1). nationalPrefixFormattingRule = NP_PATTERN.matcher(nationalPrefixFormattingRule).replaceFirst(nationalPrefix); nationalPrefixFormattingRule = FG_PATTERN.matcher(nationalPrefixFormattingRule).replaceFirst("\\$1"); - numFormatCopy.nationalPrefixFormattingRule = nationalPrefixFormattingRule; + numFormatCopy.setNationalPrefixFormattingRule(nationalPrefixFormattingRule); } else { // We don't want to have a rule for how to format the national prefix if there isn't one. - numFormatCopy.nationalPrefixFormattingRule = ""; + numFormatCopy.clearNationalPrefixFormattingRule(); } } formattedNumber.append( @@ -1369,16 +1392,16 @@ public class PhoneNumberUtil { } // Metadata cannot be null because we checked 'isValidRegionCode()' above. PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom); - String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; + String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix(); // For regions that have multiple international prefixes, the international format of the // number is returned, unless there is a preferred international prefix. String internationalPrefixForFormatting = ""; if (UNIQUE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches()) { internationalPrefixForFormatting = internationalPrefix; - } else if (!metadataForRegionCallingFrom.preferredInternationalPrefix.equals("")) { + } else if (metadataForRegionCallingFrom.hasPreferredInternationalPrefix()) { internationalPrefixForFormatting = - metadataForRegionCallingFrom.preferredInternationalPrefix; + metadataForRegionCallingFrom.getPreferredInternationalPrefix(); } String regionCode = getRegionCodeForCountryCode(countryCallingCode); @@ -1464,7 +1487,7 @@ public class PhoneNumberUtil { PhoneMetadata metadata = getMetadataForRegion(regionCode); String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); // The format rule could still be null here if the national number was 0 and there was no // raw input (this should not be possible for numbers generated by the phonenumber library // as they would also not have a country calling code and we would have exited earlier). @@ -1476,7 +1499,7 @@ public class PhoneNumberUtil { // return the national format. // TODO: Refactor the code below with the code in // isNationalPrefixPresentIfRequired. - String candidateNationalPrefixRule = formatRule.nationalPrefixFormattingRule; + String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule(); // We assume that the first-group symbol will never be _before_ the national prefix. int indexOfFirstGroup = candidateNationalPrefixRule.indexOf("$1"); if (indexOfFirstGroup <= 0) { @@ -1492,8 +1515,9 @@ public class PhoneNumberUtil { break; } // Otherwise, we need to remove the national prefix from our output. - NumberFormat numFormatCopy = copyNumberFormat(formatRule); - numFormatCopy.nationalPrefixFormattingRule = ""; + NumberFormat numFormatCopy = new NumberFormat(); + numFormatCopy.mergeFrom(formatRule); + numFormatCopy.clearNationalPrefixFormattingRule(); List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1); numberFormats.add(numFormatCopy); formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats); @@ -1550,7 +1574,7 @@ public class PhoneNumberUtil { } String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); return formatRule != null; } @@ -1614,17 +1638,18 @@ public class PhoneNumberUtil { } else if (metadataForRegionCallingFrom != null && countryCode == getCountryCodeForValidRegion(regionCallingFrom)) { NumberFormat formattingPattern = - chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormat, + chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(), nationalNumber); if (formattingPattern == null) { // If no pattern above is matched, we format the original input. return rawInput; } - NumberFormat newFormat = copyNumberFormat(formattingPattern); + NumberFormat newFormat = new NumberFormat(); + newFormat.mergeFrom(formattingPattern); // The first group is the first group of digits that the user wrote together. - newFormat.pattern = "(\\d+)(.*)"; + newFormat.setPattern("(\\d+)(.*)"); // Here we just concatenate them back together after the national prefix has been fixed. - newFormat.format = "$1$2"; + newFormat.setFormat("$1$2"); // Now we format using this pattern instead of the default pattern, but with the national // prefix prefixed if necessary. // This will not work in the cases where the pattern (and not the leading digits) decide @@ -1637,11 +1662,11 @@ public class PhoneNumberUtil { // prefixes, the international format of the number is returned, unless there is a preferred // international prefix. if (metadataForRegionCallingFrom != null) { - String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; + String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix(); internationalPrefixForFormatting = UNIQUE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches() ? internationalPrefix - : metadataForRegionCallingFrom.preferredInternationalPrefix; + : metadataForRegionCallingFrom.getPreferredInternationalPrefix(); } StringBuilder formattedNumber = new StringBuilder(rawInput); String regionCode = getRegionCodeForCountryCode(countryCode); @@ -1723,27 +1748,27 @@ public class PhoneNumberUtil { PhoneMetadata metadata, PhoneNumberFormat numberFormat, String carrierCode) { - NumberFormat[] intlNumberFormats = metadata.intlNumberFormat; + List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats(); // When the intlNumberFormats exists, we use that to format national number for the // INTERNATIONAL format instead of using the numberDesc.numberFormats. - NumberFormat[] availableFormats = - (intlNumberFormats.length == 0 || numberFormat == PhoneNumberFormat.NATIONAL) - ? metadata.numberFormat - : metadata.intlNumberFormat; + List<NumberFormat> availableFormats = + (intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL) + ? metadata.numberFormats() + : metadata.intlNumberFormats(); NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number); return (formattingPattern == null) ? number : formatNsnUsingPattern(number, formattingPattern, numberFormat, carrierCode); } - NumberFormat chooseFormattingPatternForNumber(NumberFormat[] availableFormats, + NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats, String nationalNumber) { for (NumberFormat numFormat : availableFormats) { - int size = numFormat.leadingDigitsPattern.length; + int size = numFormat.leadingDigitsPatternSize(); if (size == 0 || regexCache.getPatternForRegex( // We always use the last leading_digits_pattern, as it is the most detailed. - numFormat.leadingDigitsPattern[size - 1]).matcher(nationalNumber).lookingAt()) { - Matcher m = regexCache.getPatternForRegex(numFormat.pattern).matcher(nationalNumber); + numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) { + Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); if (m.matches()) { return numFormat; } @@ -1765,15 +1790,15 @@ public class PhoneNumberUtil { NumberFormat formattingPattern, PhoneNumberFormat numberFormat, String carrierCode) { - String numberFormatRule = formattingPattern.format; + String numberFormatRule = formattingPattern.getFormat(); Matcher m = - regexCache.getPatternForRegex(formattingPattern.pattern).matcher(nationalNumber); + regexCache.getPatternForRegex(formattingPattern.getPattern()).matcher(nationalNumber); String formattedNationalNumber = ""; if (numberFormat == PhoneNumberFormat.NATIONAL && carrierCode != null && carrierCode.length() > 0 && - formattingPattern.domesticCarrierCodeFormattingRule.length() > 0) { + formattingPattern.getDomesticCarrierCodeFormattingRule().length() > 0) { // Replace the $CC in the formatting rule with the desired carrier code. - String carrierCodeFormattingRule = formattingPattern.domesticCarrierCodeFormattingRule; + String carrierCodeFormattingRule = formattingPattern.getDomesticCarrierCodeFormattingRule(); carrierCodeFormattingRule = CC_PATTERN.matcher(carrierCodeFormattingRule).replaceFirst(carrierCode); // Now replace the $FG in the formatting rule with the first group and the carrier code @@ -1783,7 +1808,7 @@ public class PhoneNumberUtil { formattedNationalNumber = m.replaceAll(numberFormatRule); } else { // Use the national prefix formatting rule instead. - String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; + String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); if (numberFormat == PhoneNumberFormat.NATIONAL && nationalPrefixFormattingRule != null && nationalPrefixFormattingRule.length() > 0) { @@ -1819,6 +1844,62 @@ public class PhoneNumberUtil { } /** + * Gets an invalid number for the specified region. This is useful for unit-testing purposes, + * where you want to test what will happen with an invalid number. Note that the number that is + * returned will always be able to be parsed and will have the correct country code. It may also + * be a valid *short* number/code for this region. Validity checking such numbers is handled with + * {@link com.google.i18n.phonenumbers.ShortNumberInfo}. + * + * @param regionCode the region for which an example number is needed + * @return an invalid number for the specified region. Returns null when an unsupported region or + * the region 001 (Earth) is passed in. + */ + public PhoneNumber getInvalidExampleNumber(String regionCode) { + if (!isValidRegionCode(regionCode)) { + logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode); + return null; + } + // We start off with a valid fixed-line number since every country supports this. Alternatively + // we could start with a different number type, since fixed-line numbers typically have a wide + // breadth of valid number lengths and we may have to make it very short before we get an + // invalid number. + PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode), + PhoneNumberType.FIXED_LINE); + if (!desc.hasExampleNumber()) { + // This shouldn't happen; we have a test for this. + return null; + } + String exampleNumber = desc.getExampleNumber(); + // Try and make the number invalid. We do this by changing the length. We try reducing the + // length of the number, since currently no region has a number that is the same length as + // MIN_LENGTH_FOR_NSN. This is probably quicker than making the number longer, which is another + // alternative. We could also use the possible number pattern to extract the possible lengths of + // the number to make this faster, but this method is only for unit-testing so simplicity is + // preferred to performance. We don't want to return a number that can't be parsed, so we check + // the number is long enough. We try all possible lengths because phone number plans often have + // overlapping prefixes so the number 123456 might be valid as a fixed-line number, and 12345 as + // a mobile number. It would be faster to loop in a different order, but we prefer numbers that + // look closer to real numbers (and it gives us a variety of different lengths for the resulting + // phone numbers - otherwise they would all be MIN_LENGTH_FOR_NSN digits long.) + for (int phoneNumberLength = exampleNumber.length() - 1; + phoneNumberLength >= MIN_LENGTH_FOR_NSN; + phoneNumberLength--) { + String numberToTry = exampleNumber.substring(0, phoneNumberLength); + try { + PhoneNumber possiblyValidNumber = parse(numberToTry, regionCode); + if (!isValidNumber(possiblyValidNumber)) { + return possiblyValidNumber; + } + } catch (NumberParseException e) { + // Shouldn't happen: we have already checked the length, we know example numbers have + // only valid digits, and we know the region code is fine. + } + } + // We have a test to check that this doesn't happen for any of our supported regions. + return null; + } + + /** * Gets a valid number for the specified region and number type. * * @param regionCode the region for which an example number is needed @@ -1836,8 +1917,8 @@ public class PhoneNumberUtil { } PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode), type); try { - if (!desc.exampleNumber.equals("")) { - return parse(desc.exampleNumber, regionCode); + if (desc.hasExampleNumber()) { + return parse(desc.getExampleNumber(), regionCode); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1846,6 +1927,37 @@ public class PhoneNumberUtil { } /** + * Gets a valid number for the specified number type (it may belong to any country). + * + * @param type the type of number that is needed + * @return a valid number for the specified type. Returns null when the metadata + * does not contain such information. This should only happen when no numbers of this type are + * allocated anywhere in the world anymore. + */ + public PhoneNumber getExampleNumberForType(PhoneNumberType type) { + for (String regionCode : getSupportedRegions()) { + PhoneNumber exampleNumber = getExampleNumberForType(regionCode, type); + if (exampleNumber != null) { + return exampleNumber; + } + } + // If there wasn't an example number for a region, try the non-geographical entities. + for (int countryCallingCode : getSupportedGlobalNetworkCallingCodes()) { + PhoneNumberDesc desc = getNumberDescByType( + getMetadataForNonGeographicalRegion(countryCallingCode), type); + try { + if (desc.hasExampleNumber()) { + return parse("+" + countryCallingCode + desc.getExampleNumber(), UNKNOWN_REGION); + } + } catch (NumberParseException e) { + logger.log(Level.SEVERE, e.toString()); + } + } + // There are no example numbers of this type for any country in the library. + return null; + } + + /** * Gets a valid number for the specified country calling code for a non-geographical entity. * * @param countryCallingCode the country calling code for a non-geographical entity @@ -1856,10 +1968,10 @@ public class PhoneNumberUtil { public PhoneNumber getExampleNumberForNonGeoEntity(int countryCallingCode) { PhoneMetadata metadata = getMetadataForNonGeographicalRegion(countryCallingCode); if (metadata != null) { - PhoneNumberDesc desc = metadata.generalDesc; + PhoneNumberDesc desc = metadata.getGeneralDesc(); try { - if (!desc.exampleNumber.equals("")) { - return parse("+" + countryCallingCode + desc.exampleNumber, "ZZ"); + if (desc.hasExampleNumber()) { + return parse("+" + countryCallingCode + desc.getExampleNumber(), UNKNOWN_REGION); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1882,8 +1994,8 @@ public class PhoneNumberUtil { if (numberFormat == PhoneNumberFormat.RFC3966) { formattedNumber.append(RFC3966_EXTN_PREFIX).append(number.getExtension()); } else { - if (!metadata.preferredExtnPrefix.equals("")) { - formattedNumber.append(metadata.preferredExtnPrefix).append(number.getExtension()); + if (metadata.hasPreferredExtnPrefix()) { + formattedNumber.append(metadata.getPreferredExtnPrefix()).append(number.getExtension()); } else { formattedNumber.append(DEFAULT_EXTN_PREFIX).append(number.getExtension()); } @@ -1894,28 +2006,28 @@ public class PhoneNumberUtil { PhoneNumberDesc getNumberDescByType(PhoneMetadata metadata, PhoneNumberType type) { switch (type) { case PREMIUM_RATE: - return metadata.premiumRate; + return metadata.getPremiumRate(); case TOLL_FREE: - return metadata.tollFree; + return metadata.getTollFree(); case MOBILE: - return metadata.mobile; + return metadata.getMobile(); case FIXED_LINE: case FIXED_LINE_OR_MOBILE: - return metadata.fixedLine; + return metadata.getFixedLine(); case SHARED_COST: - return metadata.sharedCost; + return metadata.getSharedCost(); case VOIP: - return metadata.voip; + return metadata.getVoip(); case PERSONAL_NUMBER: - return metadata.personalNumber; + return metadata.getPersonalNumber(); case PAGER: - return metadata.pager; + return metadata.getPager(); case UAN: - return metadata.uan; + return metadata.getUan(); case VOICEMAIL: - return metadata.voicemail; + return metadata.getVoicemail(); default: - return metadata.generalDesc; + return metadata.getGeneralDesc(); } } @@ -1936,48 +2048,48 @@ public class PhoneNumberUtil { } private PhoneNumberType getNumberTypeHelper(String nationalNumber, PhoneMetadata metadata) { - if (!isNumberMatchingDesc(nationalNumber, metadata.generalDesc)) { + if (!isNumberMatchingDesc(nationalNumber, metadata.getGeneralDesc())) { return PhoneNumberType.UNKNOWN; } - if (isNumberMatchingDesc(nationalNumber, metadata.premiumRate)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPremiumRate())) { return PhoneNumberType.PREMIUM_RATE; } - if (isNumberMatchingDesc(nationalNumber, metadata.tollFree)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getTollFree())) { return PhoneNumberType.TOLL_FREE; } - if (isNumberMatchingDesc(nationalNumber, metadata.sharedCost)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getSharedCost())) { return PhoneNumberType.SHARED_COST; } - if (isNumberMatchingDesc(nationalNumber, metadata.voip)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getVoip())) { return PhoneNumberType.VOIP; } - if (isNumberMatchingDesc(nationalNumber, metadata.personalNumber)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPersonalNumber())) { return PhoneNumberType.PERSONAL_NUMBER; } - if (isNumberMatchingDesc(nationalNumber, metadata.pager)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getPager())) { return PhoneNumberType.PAGER; } - if (isNumberMatchingDesc(nationalNumber, metadata.uan)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getUan())) { return PhoneNumberType.UAN; } - if (isNumberMatchingDesc(nationalNumber, metadata.voicemail)) { + if (isNumberMatchingDesc(nationalNumber, metadata.getVoicemail())) { return PhoneNumberType.VOICEMAIL; } - boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.fixedLine); + boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.getFixedLine()); if (isFixedLine) { - if (metadata.sameMobileAndFixedLinePattern) { + if (metadata.isSameMobileAndFixedLinePattern()) { return PhoneNumberType.FIXED_LINE_OR_MOBILE; - } else if (isNumberMatchingDesc(nationalNumber, metadata.mobile)) { + } else if (isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { return PhoneNumberType.FIXED_LINE_OR_MOBILE; } return PhoneNumberType.FIXED_LINE; } // Otherwise, test to see if the number is mobile. Only do this if certain that the patterns for // mobile and fixed line aren't the same. - if (!metadata.sameMobileAndFixedLinePattern && - isNumberMatchingDesc(nationalNumber, metadata.mobile)) { + if (!metadata.isSameMobileAndFixedLinePattern() && + isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { return PhoneNumberType.MOBILE; } return PhoneNumberType.UNKNOWN; @@ -2003,14 +2115,14 @@ public class PhoneNumberUtil { boolean isNumberPossibleForDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.possibleNumberPattern) + regexCache.getPatternForRegex(numberDesc.getPossibleNumberPattern()) .matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } boolean isNumberMatchingDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher nationalNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.nationalNumberPattern) + regexCache.getPatternForRegex(numberDesc.getNationalNumberPattern()) .matcher(nationalNumber); return isNumberPossibleForDesc(nationalNumber, numberDesc) && nationalNumberPatternMatcher.matches(); @@ -2089,8 +2201,8 @@ public class PhoneNumberUtil { // If leadingDigits is present, use this. Otherwise, do full validation. // Metadata cannot be null because the region codes come from the country calling code map. PhoneMetadata metadata = getMetadataForRegion(regionCode); - if (!metadata.leadingDigits.equals("")) { - if (regexCache.getPatternForRegex(metadata.leadingDigits) + if (metadata.hasLeadingDigits()) { + if (regexCache.getPatternForRegex(metadata.getLeadingDigits()) .matcher(nationalNumber).lookingAt()) { return regionCode; } @@ -2156,7 +2268,7 @@ public class PhoneNumberUtil { if (metadata == null) { throw new IllegalArgumentException("Invalid region code: " + regionCode); } - return metadata.countryCode; + return metadata.getCountryCode(); } /** @@ -2182,7 +2294,7 @@ public class PhoneNumberUtil { + ") provided."); return null; } - String nationalPrefix = metadata.nationalPrefix; + String nationalPrefix = metadata.getNationalPrefix(); // If no national prefix was found, we return null. if (nationalPrefix.length() == 0) { return null; @@ -2216,7 +2328,7 @@ public class PhoneNumberUtil { if (mainMetadataForCallingCode == null) { return false; } - return mainMetadataForCallingCode.leadingZeroPossible; + return mainMetadataForCallingCode.isLeadingZeroPossible(); } /** @@ -2273,7 +2385,7 @@ public class PhoneNumberUtil { */ private boolean isShorterThanPossibleNormalNumber(PhoneMetadata regionMetadata, String number) { Pattern possibleNumberPattern = regexCache.getPatternForRegex( - regionMetadata.generalDesc.possibleNumberPattern); + regionMetadata.getGeneralDesc().getPossibleNumberPattern()); return testNumberLengthAgainstPattern(possibleNumberPattern, number) == ValidationResult.TOO_SHORT; } @@ -2313,7 +2425,7 @@ public class PhoneNumberUtil { // Metadata cannot be null because the country calling code is valid. PhoneMetadata metadata = getMetadataForRegionOrCallingCode(countryCode, regionCode); Pattern possibleNumberPattern = - regexCache.getPatternForRegex(metadata.generalDesc.possibleNumberPattern); + regexCache.getPatternForRegex(metadata.getGeneralDesc().getPossibleNumberPattern()); return testNumberLengthAgainstPattern(possibleNumberPattern, nationalNumber); } @@ -2445,7 +2557,7 @@ public class PhoneNumberUtil { // Set the default prefix to be something that will never match. String possibleCountryIddPrefix = "NonMatch"; if (defaultRegionMetadata != null) { - possibleCountryIddPrefix = defaultRegionMetadata.internationalPrefix; + possibleCountryIddPrefix = defaultRegionMetadata.getInternationalPrefix(); } CountryCodeSource countryCodeSource = @@ -2473,19 +2585,19 @@ public class PhoneNumberUtil { // Check to see if the number starts with the country calling code for the default region. If // so, we remove the country calling code, and do some checks on the validity of the number // before and after. - int defaultCountryCode = defaultRegionMetadata.countryCode; + int defaultCountryCode = defaultRegionMetadata.getCountryCode(); String defaultCountryCodeString = String.valueOf(defaultCountryCode); String normalizedNumber = fullNumber.toString(); if (normalizedNumber.startsWith(defaultCountryCodeString)) { StringBuilder potentialNationalNumber = new StringBuilder(normalizedNumber.substring(defaultCountryCodeString.length())); - PhoneNumberDesc generalDesc = defaultRegionMetadata.generalDesc; + PhoneNumberDesc generalDesc = defaultRegionMetadata.getGeneralDesc(); Pattern validNumberPattern = - regexCache.getPatternForRegex(generalDesc.nationalNumberPattern); + regexCache.getPatternForRegex(generalDesc.getNationalNumberPattern()); maybeStripNationalPrefixAndCarrierCode( potentialNationalNumber, defaultRegionMetadata, null /* Don't need the carrier code */); Pattern possibleNumberPattern = - regexCache.getPatternForRegex(generalDesc.possibleNumberPattern); + regexCache.getPatternForRegex(generalDesc.getPossibleNumberPattern()); // If the number was not valid before but is valid now, or if it was too long before, we // consider the number with the country calling code stripped to be a better result and // keep that instead. @@ -2578,7 +2690,7 @@ public class PhoneNumberUtil { boolean maybeStripNationalPrefixAndCarrierCode( StringBuilder number, PhoneMetadata metadata, StringBuilder carrierCode) { int numberLength = number.length(); - String possibleNationalPrefix = metadata.nationalPrefixForParsing; + String possibleNationalPrefix = metadata.getNationalPrefixForParsing(); if (numberLength == 0 || possibleNationalPrefix.length() == 0) { // Early return for numbers of zero length. return false; @@ -2587,14 +2699,14 @@ public class PhoneNumberUtil { Matcher prefixMatcher = regexCache.getPatternForRegex(possibleNationalPrefix).matcher(number); if (prefixMatcher.lookingAt()) { Pattern nationalNumberRule = - regexCache.getPatternForRegex(metadata.generalDesc.nationalNumberPattern); + regexCache.getPatternForRegex(metadata.getGeneralDesc().getNationalNumberPattern()); // Check if the original number is viable. boolean isViableOriginalNumber = nationalNumberRule.matcher(number).matches(); // prefixMatcher.group(numOfGroups) == null implies nothing was captured by the capturing // groups in possibleNationalPrefix; therefore, no transformation is necessary, and we just // remove the national prefix. int numOfGroups = prefixMatcher.groupCount(); - String transformRule = metadata.nationalPrefixTransformRule; + String transformRule = metadata.getNationalPrefixTransformRule(); if (transformRule == null || transformRule.length() == 0 || prefixMatcher.group(numOfGroups) == null) { // If the original number was viable, and the resultant number is not, we return. @@ -2670,10 +2782,18 @@ public class PhoneNumberUtil { } /** - * Parses a string and returns it in proto buffer format. This method will throw a - * {@link com.google.i18n.phonenumbers.NumberParseException} if the number is not considered to be - * a possible number. Note that validation of whether the number is actually a valid number for a - * particular region is not performed. This can be done separately with {@link #isValidNumber}. + * Parses a string and returns it as a phone number in proto buffer format. The method is quite + * lenient and looks for a number in the input text (raw input) and does not check whether the + * string is definitely only a phone number. To do this, it ignores punctuation and white-space, + * as well as any text before the number (e.g. a leading "Tel: ") and trims the non-number bits. + * It will accept a number in any format (E164, national, international etc), assuming it can be + * interpreted with the defaultRegion supplied. It also attempts to convert any alpha characters + * into digits if it thinks this is a vanity number of the type "1800 MICROSOFT". + * + * <p> This method will throw a {@link com.google.i18n.phonenumbers.NumberParseException} if the + * number is not considered to be a possible number. Note that validation of whether the number + * is actually a valid number for a particular region is not performed. This can be done + * separately with {@link #isValidNumber}. * * @param numberToParse number that we are attempting to parse. This can contain formatting * such as +, ( and -, as well as a phone number extension. It can also @@ -2685,9 +2805,10 @@ public class PhoneNumberUtil { * start with a '+' followed by the country calling code, then * "ZZ" or null can be supplied. * @return a phone number proto buffer filled with the parsed number - * @throws NumberParseException if the string is not considered to be a viable phone number or if - * no default region was supplied and the number is not in - * international format (does not start with +) + * @throws NumberParseException if the string is not considered to be a viable phone number (e.g. + * too few or too many digits) or if no default region was supplied + * and the number is not in international format (does not start + * with +) */ public PhoneNumber parse(String numberToParse, String defaultRegion) throws NumberParseException { @@ -2880,7 +3001,7 @@ public class PhoneNumberUtil { normalize(nationalNumber); normalizedNationalNumber.append(nationalNumber); if (defaultRegion != null) { - countryCode = regionMetadata.countryCode; + countryCode = regionMetadata.getCountryCode(); phoneNumber.setCountryCode(countryCode); } else if (keepRawInput) { phoneNumber.clearCountryCodeSource(); @@ -3154,7 +3275,7 @@ public class PhoneNumberUtil { return true; } String nationalSignificantNumber = getNationalSignificantNumber(number); - return !isNumberMatchingDesc(nationalSignificantNumber, metadata.noInternationalDialling); + return !isNumberMatchingDesc(nationalSignificantNumber, metadata.getNoInternationalDialling()); } /** @@ -3170,6 +3291,6 @@ public class PhoneNumberUtil { logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode); return false; } - return metadata.mobileNumberPortableRegion; + return metadata.isMobileNumberPortableRegion(); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java new file mode 100644 index 00000000..ac63ec6f --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java @@ -0,0 +1,1119 @@ +/* + * Copyright (C) 2010 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Definition of the class representing metadata for international telephone numbers. This class is + * hand created based on the class file compiled from phonemetadata.proto. Please refer to that file + * for detailed descriptions of the meaning of each field. + */ + +package com.google.i18n.phonenumbers; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +public final class Phonemetadata { + private Phonemetadata() {} + public static class NumberFormat implements Externalizable { + private static final long serialVersionUID = 1; + public NumberFormat() {} + + /** + * Provides a dummy builder to 'emulate' the API of the code generated by the latest version of + * Protocol Buffers. This lets BuildMetadataFromXml class to build with both this hand created + * class and the one generated by the latest version of Protocol Buffers. + */ + public static final class Builder extends NumberFormat { + public NumberFormat build() { + return this; + } + } + + public static Builder newBuilder() { + return new Builder(); + } + + // required string pattern = 1; + private boolean hasPattern; + private String pattern_ = ""; + public boolean hasPattern() { return hasPattern; } + public String getPattern() { return pattern_; } + public NumberFormat setPattern(String value) { + hasPattern = true; + pattern_ = value; + return this; + } + + // required string format = 2; + private boolean hasFormat; + private String format_ = ""; + public boolean hasFormat() { return hasFormat; } + public String getFormat() { return format_; } + public NumberFormat setFormat(String value) { + hasFormat = true; + format_ = value; + return this; + } + + // repeated string leading_digits_pattern = 3; + private java.util.List<String> leadingDigitsPattern_ = new java.util.ArrayList<String>(); + public java.util.List<String> leadingDigitPatterns() { + return leadingDigitsPattern_; + } + public int leadingDigitsPatternSize() { return leadingDigitsPattern_.size(); } + public String getLeadingDigitsPattern(int index) { + return leadingDigitsPattern_.get(index); + } + public NumberFormat addLeadingDigitsPattern(String value) { + if (value == null) { + throw new NullPointerException(); + } + leadingDigitsPattern_.add(value); + return this; + } + + // optional string national_prefix_formatting_rule = 4; + private boolean hasNationalPrefixFormattingRule; + private String nationalPrefixFormattingRule_ = ""; + public boolean hasNationalPrefixFormattingRule() { return hasNationalPrefixFormattingRule; } + public String getNationalPrefixFormattingRule() { return nationalPrefixFormattingRule_; } + public NumberFormat setNationalPrefixFormattingRule(String value) { + hasNationalPrefixFormattingRule = true; + nationalPrefixFormattingRule_ = value; + return this; + } + public NumberFormat clearNationalPrefixFormattingRule() { + hasNationalPrefixFormattingRule = false; + nationalPrefixFormattingRule_ = ""; + return this; + } + + // optional bool national_prefix_optional_when_formatting = 6; + private boolean hasNationalPrefixOptionalWhenFormatting; + private boolean nationalPrefixOptionalWhenFormatting_ = false; + public boolean hasNationalPrefixOptionalWhenFormatting() { + return hasNationalPrefixOptionalWhenFormatting; } + public boolean isNationalPrefixOptionalWhenFormatting() { + return nationalPrefixOptionalWhenFormatting_; } + public NumberFormat setNationalPrefixOptionalWhenFormatting(boolean value) { + hasNationalPrefixOptionalWhenFormatting = true; + nationalPrefixOptionalWhenFormatting_ = value; + return this; + } + + // optional string domestic_carrier_code_formatting_rule = 5; + private boolean hasDomesticCarrierCodeFormattingRule; + private String domesticCarrierCodeFormattingRule_ = ""; + public boolean hasDomesticCarrierCodeFormattingRule() { + return hasDomesticCarrierCodeFormattingRule; } + public String getDomesticCarrierCodeFormattingRule() { + return domesticCarrierCodeFormattingRule_; } + public NumberFormat setDomesticCarrierCodeFormattingRule(String value) { + hasDomesticCarrierCodeFormattingRule = true; + domesticCarrierCodeFormattingRule_ = value; + return this; + } + + public NumberFormat mergeFrom(NumberFormat other) { + if (other.hasPattern()) { + setPattern(other.getPattern()); + } + if (other.hasFormat()) { + setFormat(other.getFormat()); + } + int leadingDigitsPatternSize = other.leadingDigitsPatternSize(); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + addLeadingDigitsPattern(other.getLeadingDigitsPattern(i)); + } + if (other.hasNationalPrefixFormattingRule()) { + setNationalPrefixFormattingRule(other.getNationalPrefixFormattingRule()); + } + if (other.hasDomesticCarrierCodeFormattingRule()) { + setDomesticCarrierCodeFormattingRule(other.getDomesticCarrierCodeFormattingRule()); + } + setNationalPrefixOptionalWhenFormatting(other.isNationalPrefixOptionalWhenFormatting()); + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeUTF(pattern_); + objectOutput.writeUTF(format_); + int leadingDigitsPatternSize = leadingDigitsPatternSize(); + objectOutput.writeInt(leadingDigitsPatternSize); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + objectOutput.writeUTF(leadingDigitsPattern_.get(i)); + } + + objectOutput.writeBoolean(hasNationalPrefixFormattingRule); + if (hasNationalPrefixFormattingRule) { + objectOutput.writeUTF(nationalPrefixFormattingRule_); + } + objectOutput.writeBoolean(hasDomesticCarrierCodeFormattingRule); + if (hasDomesticCarrierCodeFormattingRule) { + objectOutput.writeUTF(domesticCarrierCodeFormattingRule_); + } + objectOutput.writeBoolean(nationalPrefixOptionalWhenFormatting_); + } + + public void readExternal(ObjectInput objectInput) throws IOException { + setPattern(objectInput.readUTF()); + setFormat(objectInput.readUTF()); + int leadingDigitsPatternSize = objectInput.readInt(); + for (int i = 0; i < leadingDigitsPatternSize; i++) { + leadingDigitsPattern_.add(objectInput.readUTF()); + } + if (objectInput.readBoolean()) { + setNationalPrefixFormattingRule(objectInput.readUTF()); + } + if (objectInput.readBoolean()) { + setDomesticCarrierCodeFormattingRule(objectInput.readUTF()); + } + setNationalPrefixOptionalWhenFormatting(objectInput.readBoolean()); + } + } + + public static class PhoneNumberDesc implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneNumberDesc() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneNumberDesc { + public PhoneNumberDesc build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // optional string national_number_pattern = 2; + private boolean hasNationalNumberPattern; + private String nationalNumberPattern_ = ""; + public boolean hasNationalNumberPattern() { return hasNationalNumberPattern; } + public String getNationalNumberPattern() { return nationalNumberPattern_; } + public PhoneNumberDesc setNationalNumberPattern(String value) { + hasNationalNumberPattern = true; + nationalNumberPattern_ = value; + return this; + } + + // optional string possible_number_pattern = 3; + private boolean hasPossibleNumberPattern; + private String possibleNumberPattern_ = ""; + public boolean hasPossibleNumberPattern() { return hasPossibleNumberPattern; } + public String getPossibleNumberPattern() { return possibleNumberPattern_; } + public PhoneNumberDesc setPossibleNumberPattern(String value) { + hasPossibleNumberPattern = true; + possibleNumberPattern_ = value; + return this; + } + + // repeated int32 possible_length = 9; + private java.util.List<Integer> possibleLength_ = new java.util.ArrayList<Integer>(); + public java.util.List<Integer> getPossibleLengthList() { + return possibleLength_; + } + public int getPossibleLengthCount() { return possibleLength_.size(); } + public int getPossibleLength(int index) { + return possibleLength_.get(index); + } + public PhoneNumberDesc addPossibleLength(int value) { + possibleLength_.add(value); + return this; + } + public PhoneNumberDesc clearPossibleLength() { + possibleLength_.clear(); + return this; + } + + // repeated int32 possible_length_local_only = 10; + private java.util.List<Integer> possibleLengthLocalOnly_ = new java.util.ArrayList<Integer>(); + public java.util.List<Integer> getPossibleLengthLocalOnlyList() { + return possibleLengthLocalOnly_; + } + public int getPossibleLengthLocalOnlyCount() { return possibleLengthLocalOnly_.size(); } + public int getPossibleLengthLocalOnly(int index) { + return possibleLengthLocalOnly_.get(index); + } + public PhoneNumberDesc addPossibleLengthLocalOnly(int value) { + possibleLengthLocalOnly_.add(value); + return this; + } + public PhoneNumberDesc clearPossibleLengthLocalOnly() { + possibleLengthLocalOnly_.clear(); + return this; + } + + // optional string example_number = 6; + private boolean hasExampleNumber; + private String exampleNumber_ = ""; + public boolean hasExampleNumber() { return hasExampleNumber; } + public String getExampleNumber() { return exampleNumber_; } + public PhoneNumberDesc setExampleNumber(String value) { + hasExampleNumber = true; + exampleNumber_ = value; + return this; + } + + public PhoneNumberDesc mergeFrom(PhoneNumberDesc other) { + if (other.hasNationalNumberPattern()) { + setNationalNumberPattern(other.getNationalNumberPattern()); + } + if (other.hasPossibleNumberPattern()) { + setPossibleNumberPattern(other.getPossibleNumberPattern()); + } + for (int i = 0; i < other.getPossibleLengthCount(); i++) { + addPossibleLength(other.getPossibleLength(i)); + } + for (int i = 0; i < other.getPossibleLengthLocalOnlyCount(); i++) { + addPossibleLengthLocalOnly(other.getPossibleLengthLocalOnly(i)); + } + if (other.hasExampleNumber()) { + setExampleNumber(other.getExampleNumber()); + } + return this; + } + + public boolean exactlySameAs(PhoneNumberDesc other) { + return nationalNumberPattern_.equals(other.nationalNumberPattern_) && + possibleNumberPattern_.equals(other.possibleNumberPattern_) && + possibleLength_.equals(other.possibleLength_) && + possibleLengthLocalOnly_.equals(other.possibleLengthLocalOnly_) && + exampleNumber_.equals(other.exampleNumber_); + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeBoolean(hasNationalNumberPattern); + if (hasNationalNumberPattern) { + objectOutput.writeUTF(nationalNumberPattern_); + } + + objectOutput.writeBoolean(hasPossibleNumberPattern); + if (hasPossibleNumberPattern) { + objectOutput.writeUTF(possibleNumberPattern_); + } + + int possibleLengthSize = getPossibleLengthCount(); + objectOutput.writeInt(possibleLengthSize); + for (int i = 0; i < possibleLengthSize; i++) { + objectOutput.writeInt(possibleLength_.get(i)); + } + + int possibleLengthLocalOnlySize = getPossibleLengthLocalOnlyCount(); + objectOutput.writeInt(possibleLengthLocalOnlySize); + for (int i = 0; i < possibleLengthLocalOnlySize; i++) { + objectOutput.writeInt(possibleLengthLocalOnly_.get(i)); + } + + objectOutput.writeBoolean(hasExampleNumber); + if (hasExampleNumber) { + objectOutput.writeUTF(exampleNumber_); + } + } + + public void readExternal(ObjectInput objectInput) throws IOException { + if (objectInput.readBoolean()) { + setNationalNumberPattern(objectInput.readUTF()); + } + + if (objectInput.readBoolean()) { + setPossibleNumberPattern(objectInput.readUTF()); + } + + int possibleLengthSize = objectInput.readInt(); + for (int i = 0; i < possibleLengthSize; i++) { + possibleLength_.add(objectInput.readInt()); + } + + int possibleLengthLocalOnlySize = objectInput.readInt(); + for (int i = 0; i < possibleLengthLocalOnlySize; i++) { + possibleLengthLocalOnly_.add(objectInput.readInt()); + } + + if (objectInput.readBoolean()) { + setExampleNumber(objectInput.readUTF()); + } + } + } + + public static class PhoneMetadata implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneMetadata() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneMetadata { + public PhoneMetadata build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // optional PhoneNumberDesc general_desc = 1; + private boolean hasGeneralDesc; + private PhoneNumberDesc generalDesc_ = null; + public boolean hasGeneralDesc() { return hasGeneralDesc; } + public PhoneNumberDesc getGeneralDesc() { return generalDesc_; } + public PhoneMetadata setGeneralDesc(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasGeneralDesc = true; + generalDesc_ = value; + return this; + } + + // optional PhoneNumberDesc fixed_line = 2; + private boolean hasFixedLine; + private PhoneNumberDesc fixedLine_ = null; + public boolean hasFixedLine() { return hasFixedLine; } + public PhoneNumberDesc getFixedLine() { return fixedLine_; } + public PhoneMetadata setFixedLine(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasFixedLine = true; + fixedLine_ = value; + return this; + } + + // optional PhoneNumberDesc mobile = 3; + private boolean hasMobile; + private PhoneNumberDesc mobile_ = null; + public boolean hasMobile() { return hasMobile; } + public PhoneNumberDesc getMobile() { return mobile_; } + public PhoneMetadata setMobile(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasMobile = true; + mobile_ = value; + return this; + } + + // optional PhoneNumberDesc toll_free = 4; + private boolean hasTollFree; + private PhoneNumberDesc tollFree_ = null; + public boolean hasTollFree() { return hasTollFree; } + public PhoneNumberDesc getTollFree() { return tollFree_; } + public PhoneMetadata setTollFree(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasTollFree = true; + tollFree_ = value; + return this; + } + + // optional PhoneNumberDesc premium_rate = 5; + private boolean hasPremiumRate; + private PhoneNumberDesc premiumRate_ = null; + public boolean hasPremiumRate() { return hasPremiumRate; } + public PhoneNumberDesc getPremiumRate() { return premiumRate_; } + public PhoneMetadata setPremiumRate(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPremiumRate = true; + premiumRate_ = value; + return this; + } + + // optional PhoneNumberDesc shared_cost = 6; + private boolean hasSharedCost; + private PhoneNumberDesc sharedCost_ = null; + public boolean hasSharedCost() { return hasSharedCost; } + public PhoneNumberDesc getSharedCost() { return sharedCost_; } + public PhoneMetadata setSharedCost(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasSharedCost = true; + sharedCost_ = value; + return this; + } + + // optional PhoneNumberDesc personal_number = 7; + private boolean hasPersonalNumber; + private PhoneNumberDesc personalNumber_ = null; + public boolean hasPersonalNumber() { return hasPersonalNumber; } + public PhoneNumberDesc getPersonalNumber() { return personalNumber_; } + public PhoneMetadata setPersonalNumber(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPersonalNumber = true; + personalNumber_ = value; + return this; + } + + // optional PhoneNumberDesc voip = 8; + private boolean hasVoip; + private PhoneNumberDesc voip_ = null; + public boolean hasVoip() { return hasVoip; } + public PhoneNumberDesc getVoip() { return voip_; } + public PhoneMetadata setVoip(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasVoip = true; + voip_ = value; + return this; + } + + // optional PhoneNumberDesc pager = 21; + private boolean hasPager; + private PhoneNumberDesc pager_ = null; + public boolean hasPager() { return hasPager; } + public PhoneNumberDesc getPager() { return pager_; } + public PhoneMetadata setPager(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasPager = true; + pager_ = value; + return this; + } + + // optional PhoneNumberDesc uan = 25; + private boolean hasUan; + private PhoneNumberDesc uan_ = null; + public boolean hasUan() { return hasUan; } + public PhoneNumberDesc getUan() { return uan_; } + public PhoneMetadata setUan(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasUan = true; + uan_ = value; + return this; + } + + // optional PhoneNumberDesc emergency = 27; + private boolean hasEmergency; + private PhoneNumberDesc emergency_ = null; + public boolean hasEmergency() { return hasEmergency; } + public PhoneNumberDesc getEmergency() { return emergency_; } + public PhoneMetadata setEmergency(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasEmergency = true; + emergency_ = value; + return this; + } + + // optional PhoneNumberDesc voicemail = 28; + private boolean hasVoicemail; + private PhoneNumberDesc voicemail_ = null; + public boolean hasVoicemail() { return hasVoicemail; } + public PhoneNumberDesc getVoicemail() { return voicemail_; } + public PhoneMetadata setVoicemail(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasVoicemail = true; + voicemail_ = value; + return this; + } + + // optional PhoneNumberDesc short_code = 29; + private boolean hasShortCode; + private PhoneNumberDesc shortCode_ = null; + public boolean hasShortCode() { return hasShortCode; } + public PhoneNumberDesc getShortCode() { return shortCode_; } + public PhoneMetadata setShortCode(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasShortCode = true; + shortCode_ = value; + return this; + } + + // optional PhoneNumberDesc standard_rate = 30; + private boolean hasStandardRate; + private PhoneNumberDesc standardRate_ = null; + public boolean hasStandardRate() { return hasStandardRate; } + public PhoneNumberDesc getStandardRate() { return standardRate_; } + public PhoneMetadata setStandardRate(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasStandardRate = true; + standardRate_ = value; + return this; + } + + // optional PhoneNumberDesc carrier_specific = 31; + private boolean hasCarrierSpecific; + private PhoneNumberDesc carrierSpecific_ = null; + public boolean hasCarrierSpecific() { return hasCarrierSpecific; } + public PhoneNumberDesc getCarrierSpecific() { return carrierSpecific_; } + public PhoneMetadata setCarrierSpecific(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasCarrierSpecific = true; + carrierSpecific_ = value; + return this; + } + + // optional PhoneNumberDesc noInternationalDialling = 24; + private boolean hasNoInternationalDialling; + private PhoneNumberDesc noInternationalDialling_ = null; + public boolean hasNoInternationalDialling() { return hasNoInternationalDialling; } + public PhoneNumberDesc getNoInternationalDialling() { return noInternationalDialling_; } + public PhoneMetadata setNoInternationalDialling(PhoneNumberDesc value) { + if (value == null) { + throw new NullPointerException(); + } + hasNoInternationalDialling = true; + noInternationalDialling_ = value; + return this; + } + + // required string id = 9; + private boolean hasId; + private String id_ = ""; + public boolean hasId() { return hasId; } + public String getId() { return id_; } + public PhoneMetadata setId(String value) { + hasId = true; + id_ = value; + return this; + } + + // optional int32 country_code = 10; + private boolean hasCountryCode; + private int countryCode_ = 0; + public boolean hasCountryCode() { return hasCountryCode; } + public int getCountryCode() { return countryCode_; } + public PhoneMetadata setCountryCode(int value) { + hasCountryCode = true; + countryCode_ = value; + return this; + } + + // optional string international_prefix = 11; + private boolean hasInternationalPrefix; + private String internationalPrefix_ = ""; + public boolean hasInternationalPrefix() { return hasInternationalPrefix; } + public String getInternationalPrefix() { return internationalPrefix_; } + public PhoneMetadata setInternationalPrefix(String value) { + hasInternationalPrefix = true; + internationalPrefix_ = value; + return this; + } + + // optional string preferred_international_prefix = 17; + private boolean hasPreferredInternationalPrefix; + private String preferredInternationalPrefix_ = ""; + public boolean hasPreferredInternationalPrefix() { return hasPreferredInternationalPrefix; } + public String getPreferredInternationalPrefix() { return preferredInternationalPrefix_; } + public PhoneMetadata setPreferredInternationalPrefix(String value) { + hasPreferredInternationalPrefix = true; + preferredInternationalPrefix_ = value; + return this; + } + + // optional string national_prefix = 12; + private boolean hasNationalPrefix; + private String nationalPrefix_ = ""; + public boolean hasNationalPrefix() { return hasNationalPrefix; } + public String getNationalPrefix() { return nationalPrefix_; } + public PhoneMetadata setNationalPrefix(String value) { + hasNationalPrefix = true; + nationalPrefix_ = value; + return this; + } + + // optional string preferred_extn_prefix = 13; + private boolean hasPreferredExtnPrefix; + private String preferredExtnPrefix_ = ""; + public boolean hasPreferredExtnPrefix() { return hasPreferredExtnPrefix; } + public String getPreferredExtnPrefix() { return preferredExtnPrefix_; } + public PhoneMetadata setPreferredExtnPrefix(String value) { + hasPreferredExtnPrefix = true; + preferredExtnPrefix_ = value; + return this; + } + + // optional string national_prefix_for_parsing = 15; + private boolean hasNationalPrefixForParsing; + private String nationalPrefixForParsing_ = ""; + public boolean hasNationalPrefixForParsing() { return hasNationalPrefixForParsing; } + public String getNationalPrefixForParsing() { return nationalPrefixForParsing_; } + public PhoneMetadata setNationalPrefixForParsing(String value) { + hasNationalPrefixForParsing = true; + nationalPrefixForParsing_ = value; + return this; + } + + // optional string national_prefix_transform_rule = 16; + private boolean hasNationalPrefixTransformRule; + private String nationalPrefixTransformRule_ = ""; + public boolean hasNationalPrefixTransformRule() { return hasNationalPrefixTransformRule; } + public String getNationalPrefixTransformRule() { return nationalPrefixTransformRule_; } + public PhoneMetadata setNationalPrefixTransformRule(String value) { + hasNationalPrefixTransformRule = true; + nationalPrefixTransformRule_ = value; + return this; + } + + // optional bool same_mobile_and_fixed_line_pattern = 18 [default = false]; + private boolean hasSameMobileAndFixedLinePattern; + private boolean sameMobileAndFixedLinePattern_ = false; + public boolean hasSameMobileAndFixedLinePattern() { return hasSameMobileAndFixedLinePattern; } + public boolean isSameMobileAndFixedLinePattern() { return sameMobileAndFixedLinePattern_; } + public PhoneMetadata setSameMobileAndFixedLinePattern(boolean value) { + hasSameMobileAndFixedLinePattern = true; + sameMobileAndFixedLinePattern_ = value; + return this; + } + + // repeated NumberFormat number_format = 19; + private java.util.List<NumberFormat> numberFormat_ = new java.util.ArrayList<NumberFormat>(); + public java.util.List<NumberFormat> numberFormats() { + return numberFormat_; + } + public int numberFormatSize() { return numberFormat_.size(); } + public NumberFormat getNumberFormat(int index) { + return numberFormat_.get(index); + } + public PhoneMetadata addNumberFormat(NumberFormat value) { + if (value == null) { + throw new NullPointerException(); + } + numberFormat_.add(value); + return this; + } + + // repeated NumberFormat intl_number_format = 20; + private java.util.List<NumberFormat> intlNumberFormat_ = + new java.util.ArrayList<NumberFormat>(); + public java.util.List<NumberFormat> intlNumberFormats() { + return intlNumberFormat_; + } + public int intlNumberFormatSize() { return intlNumberFormat_.size(); } + public NumberFormat getIntlNumberFormat(int index) { + return intlNumberFormat_.get(index); + } + + public PhoneMetadata addIntlNumberFormat(NumberFormat value) { + if (value == null) { + throw new NullPointerException(); + } + intlNumberFormat_.add(value); + return this; + } + public PhoneMetadata clearIntlNumberFormat() { + intlNumberFormat_.clear(); + return this; + } + + // optional bool main_country_for_code = 22 [default = false]; + private boolean hasMainCountryForCode; + private boolean mainCountryForCode_ = false; + public boolean hasMainCountryForCode() { return hasMainCountryForCode; } + public boolean isMainCountryForCode() { return mainCountryForCode_; } + // Method that lets this class have the same interface as the one generated by Protocol Buffers + // which is used by C++ build tools. + public boolean getMainCountryForCode() { return mainCountryForCode_; } + public PhoneMetadata setMainCountryForCode(boolean value) { + hasMainCountryForCode = true; + mainCountryForCode_ = value; + return this; + } + + // optional string leading_digits = 23; + private boolean hasLeadingDigits; + private String leadingDigits_ = ""; + public boolean hasLeadingDigits() { return hasLeadingDigits; } + public String getLeadingDigits() { return leadingDigits_; } + public PhoneMetadata setLeadingDigits(String value) { + hasLeadingDigits = true; + leadingDigits_ = value; + return this; + } + + // optional bool leading_zero_possible = 26 [default = false]; + private boolean hasLeadingZeroPossible; + private boolean leadingZeroPossible_ = false; + public boolean hasLeadingZeroPossible() { return hasLeadingZeroPossible; } + public boolean isLeadingZeroPossible() { return leadingZeroPossible_; } + public PhoneMetadata setLeadingZeroPossible(boolean value) { + hasLeadingZeroPossible = true; + leadingZeroPossible_ = value; + return this; + } + + // optional bool mobile_number_portable_region = 32 [default = false]; + private boolean hasMobileNumberPortableRegion; + private boolean mobileNumberPortableRegion_ = false; + public boolean hasMobileNumberPortableRegion() { return hasMobileNumberPortableRegion; } + public boolean isMobileNumberPortableRegion() { return mobileNumberPortableRegion_; } + public PhoneMetadata setMobileNumberPortableRegion(boolean value) { + hasMobileNumberPortableRegion = true; + mobileNumberPortableRegion_ = value; + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + objectOutput.writeBoolean(hasGeneralDesc); + if (hasGeneralDesc) { + generalDesc_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasFixedLine); + if (hasFixedLine) { + fixedLine_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasMobile); + if (hasMobile) { + mobile_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasTollFree); + if (hasTollFree) { + tollFree_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPremiumRate); + if (hasPremiumRate) { + premiumRate_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasSharedCost); + if (hasSharedCost) { + sharedCost_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPersonalNumber); + if (hasPersonalNumber) { + personalNumber_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasVoip); + if (hasVoip) { + voip_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasPager); + if (hasPager) { + pager_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasUan); + if (hasUan) { + uan_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasEmergency); + if (hasEmergency) { + emergency_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasVoicemail); + if (hasVoicemail) { + voicemail_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasShortCode); + if (hasShortCode) { + shortCode_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasStandardRate); + if (hasStandardRate) { + standardRate_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasCarrierSpecific); + if (hasCarrierSpecific) { + carrierSpecific_.writeExternal(objectOutput); + } + objectOutput.writeBoolean(hasNoInternationalDialling); + if (hasNoInternationalDialling) { + noInternationalDialling_.writeExternal(objectOutput); + } + + objectOutput.writeUTF(id_); + objectOutput.writeInt(countryCode_); + objectOutput.writeUTF(internationalPrefix_); + + objectOutput.writeBoolean(hasPreferredInternationalPrefix); + if (hasPreferredInternationalPrefix) { + objectOutput.writeUTF(preferredInternationalPrefix_); + } + + objectOutput.writeBoolean(hasNationalPrefix); + if (hasNationalPrefix) { + objectOutput.writeUTF(nationalPrefix_); + } + + objectOutput.writeBoolean(hasPreferredExtnPrefix); + if (hasPreferredExtnPrefix) { + objectOutput.writeUTF(preferredExtnPrefix_); + } + + objectOutput.writeBoolean(hasNationalPrefixForParsing); + if (hasNationalPrefixForParsing) { + objectOutput.writeUTF(nationalPrefixForParsing_); + } + + objectOutput.writeBoolean(hasNationalPrefixTransformRule); + if (hasNationalPrefixTransformRule) { + objectOutput.writeUTF(nationalPrefixTransformRule_); + } + + objectOutput.writeBoolean(sameMobileAndFixedLinePattern_); + + int numberFormatSize = numberFormatSize(); + objectOutput.writeInt(numberFormatSize); + for (int i = 0; i < numberFormatSize; i++) { + numberFormat_.get(i).writeExternal(objectOutput); + } + + int intlNumberFormatSize = intlNumberFormatSize(); + objectOutput.writeInt(intlNumberFormatSize); + for (int i = 0; i < intlNumberFormatSize; i++) { + intlNumberFormat_.get(i).writeExternal(objectOutput); + } + + objectOutput.writeBoolean(mainCountryForCode_); + + objectOutput.writeBoolean(hasLeadingDigits); + if (hasLeadingDigits) { + objectOutput.writeUTF(leadingDigits_); + } + + objectOutput.writeBoolean(leadingZeroPossible_); + + objectOutput.writeBoolean(mobileNumberPortableRegion_); + } + + public void readExternal(ObjectInput objectInput) throws IOException { + boolean hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setGeneralDesc(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setFixedLine(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setMobile(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setTollFree(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPremiumRate(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setSharedCost(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPersonalNumber(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setVoip(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setPager(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setUan(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setEmergency(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setVoicemail(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setShortCode(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setStandardRate(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setCarrierSpecific(desc); + } + hasDesc = objectInput.readBoolean(); + if (hasDesc) { + PhoneNumberDesc desc = new PhoneNumberDesc(); + desc.readExternal(objectInput); + setNoInternationalDialling(desc); + } + + setId(objectInput.readUTF()); + setCountryCode(objectInput.readInt()); + setInternationalPrefix(objectInput.readUTF()); + + boolean hasString = objectInput.readBoolean(); + if (hasString) { + setPreferredInternationalPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setPreferredExtnPrefix(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefixForParsing(objectInput.readUTF()); + } + + hasString = objectInput.readBoolean(); + if (hasString) { + setNationalPrefixTransformRule(objectInput.readUTF()); + } + + setSameMobileAndFixedLinePattern(objectInput.readBoolean()); + + int nationalFormatSize = objectInput.readInt(); + for (int i = 0; i < nationalFormatSize; i++) { + NumberFormat numFormat = new NumberFormat(); + numFormat.readExternal(objectInput); + numberFormat_.add(numFormat); + } + + int intlNumberFormatSize = objectInput.readInt(); + for (int i = 0; i < intlNumberFormatSize; i++) { + NumberFormat numFormat = new NumberFormat(); + numFormat.readExternal(objectInput); + intlNumberFormat_.add(numFormat); + } + + setMainCountryForCode(objectInput.readBoolean()); + + hasString = objectInput.readBoolean(); + if (hasString) { + setLeadingDigits(objectInput.readUTF()); + } + + setLeadingZeroPossible(objectInput.readBoolean()); + + setMobileNumberPortableRegion(objectInput.readBoolean()); + } + } + + public static class PhoneMetadataCollection implements Externalizable { + private static final long serialVersionUID = 1; + public PhoneMetadataCollection() {} + + /** + * Provides a dummy builder. + * + * @see NumberFormat.Builder + */ + public static final class Builder extends PhoneMetadataCollection { + public PhoneMetadataCollection build() { + return this; + } + } + public static Builder newBuilder() { + return new Builder(); + } + + // repeated PhoneMetadata metadata = 1; + private java.util.List<PhoneMetadata> metadata_ = new java.util.ArrayList<PhoneMetadata>(); + + public java.util.List<PhoneMetadata> getMetadataList() { + return metadata_; + } + public int getMetadataCount() { return metadata_.size(); } + + public PhoneMetadataCollection addMetadata(PhoneMetadata value) { + if (value == null) { + throw new NullPointerException(); + } + metadata_.add(value); + return this; + } + + public void writeExternal(ObjectOutput objectOutput) throws IOException { + int size = getMetadataCount(); + objectOutput.writeInt(size); + for (int i = 0; i < size; i++) { + metadata_.get(i).writeExternal(objectOutput); + } + } + + public void readExternal(ObjectInput objectInput) throws IOException { + int size = objectInput.readInt(); + for (int i = 0; i < size; i++) { + PhoneMetadata metadata = new PhoneMetadata(); + metadata.readExternal(objectInput); + metadata_.add(metadata); + } + } + + public PhoneMetadataCollection clear() { + metadata_.clear(); + return this; + } + } +} diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java index fe5ca8f3..abe800ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java @@ -16,11 +16,11 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.internal.MatcherApi; import com.google.i18n.phonenumbers.internal.RegexBasedMatcher; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import java.util.ArrayList; import java.util.Arrays; @@ -130,7 +130,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc); + return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc()); } /** @@ -151,7 +151,7 @@ public class ShortNumberInfo { return false; } return matcherApi.matchesPossibleNumber(getNationalSignificantNumber(number), - phoneMetadata.generalDesc); + phoneMetadata.getGeneralDesc()); } /** @@ -171,7 +171,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { continue; } - if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc)) { + if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) { return true; } } @@ -199,11 +199,11 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; + PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; + PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -226,11 +226,11 @@ public class ShortNumberInfo { return false; } String shortNumber = getNationalSignificantNumber(number); - PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; + PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; + PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -292,13 +292,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -346,13 +346,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -429,7 +429,7 @@ public class ShortNumberInfo { for (String regionCode : regionCodes) { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); if (phoneMetadata != null - && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.shortCode)) { + && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.getShortCode())) { // The number is valid for this region. return regionCode; } @@ -457,9 +457,9 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return ""; } - PhoneNumberDesc desc = phoneMetadata.shortCode; - if (!desc.exampleNumber.equals("")) { - return desc.exampleNumber; + PhoneNumberDesc desc = phoneMetadata.getShortCode(); + if (desc.hasExampleNumber()) { + return desc.getExampleNumber(); } return ""; } @@ -481,20 +481,20 @@ public class ShortNumberInfo { PhoneNumberDesc desc = null; switch (cost) { case TOLL_FREE: - desc = phoneMetadata.tollFree; + desc = phoneMetadata.getTollFree(); break; case STANDARD_RATE: - desc = phoneMetadata.standardRate; + desc = phoneMetadata.getStandardRate(); break; case PREMIUM_RATE: - desc = phoneMetadata.premiumRate; + desc = phoneMetadata.getPremiumRate(); break; default: // UNKNOWN_COST numbers are computed by the process of elimination from the other cost // categories. } - if (desc != null && !desc.exampleNumber.equals("")) { - return desc.exampleNumber; + if (desc != null && desc.hasExampleNumber()) { + return desc.getExampleNumber(); } return ""; } @@ -543,12 +543,12 @@ public class ShortNumberInfo { return false; } PhoneMetadata metadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); - if (metadata == null || metadata.emergency == null) { + if (metadata == null || !metadata.hasEmergency()) { return false; } String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); - PhoneNumberDesc emergencyDesc = metadata.emergency; + PhoneNumberDesc emergencyDesc = metadata.getEmergency(); boolean allowPrefixMatchForRegion = allowPrefixMatch && !REGIONS_WHERE_EMERGENCY_NUMBERS_MUST_BE_EXACT.contains(regionCode); return matcherApi.matchesNationalNumber(normalizedNumber, emergencyDesc, @@ -572,7 +572,7 @@ public class ShortNumberInfo { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); return (phoneMetadata != null) && (matchesPossibleNumberAndNationalNumber(nationalNumber, - phoneMetadata.carrierSpecific)); + phoneMetadata.getCarrierSpecific())); } /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java index b89c234d..9062ef44 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java @@ -16,17 +16,14 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; -import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInputStream; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; import java.util.logging.Logger; /** @@ -97,58 +94,28 @@ final class SingleFileMetadataSourceImpl implements MetadataSource { void loadMetadataFromFile() { InputStream source = metadataLoader.loadMetadata(fileName); if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); + // This should not happen since clients shouldn't be using this implementation directly. + // The single file implementation is experimental, only for when the jars contain a single + // file with all regions' metadata. Currently we do not release such jars. + // TODO(b/30807096): Get the MetadataManager to decide whether to use this or the multi file + // loading depending on what data is available in the jar. throw new IllegalStateException("missing metadata: " + fileName); } - try { - PhoneMetadataCollection metadataCollection = - loadMetadataAndCloseInput(new ObjectInputStream(source)); - PhoneMetadata[] metadataList = metadataCollection.metadata; - if (metadataList.length == 0) { - logger.log(Level.SEVERE, "empty metadata: " + fileName); - throw new IllegalStateException("empty metadata: " + fileName); - } - for (PhoneMetadata metadata : metadataList) { - String regionCode = metadata.id; - int countryCallingCode = metadata.countryCode; - boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); - if (isNonGeoRegion) { - countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); - } else { - regionToMetadataMap.put(regionCode, metadata); - } - } - } catch (IOException e) { - logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); - throw new RuntimeException("cannot load/parse metadata: " + fileName, e); + PhoneMetadataCollection metadataCollection = MetadataManager.loadMetadataAndCloseInput(source); + List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { + // This should not happen since clients shouldn't be using this implementation! + throw new IllegalStateException("empty metadata: " + fileName); } - } - - /** - * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any - * exceptions that occur while reading or closing the stream are ignored. - * - * @param source the non-null stream from which metadata is to be read. - * @return the loaded metadata protocol buffer. - */ - private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { - // The size of the byte buffer for deserializing the single nano metadata file which holds - // metadata for all regions. - final int SINGLE_FILE_BUFFER_SIZE = 256 * 1024; - - PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); - try { - metadataCollection.mergeFrom( - MetadataManager.convertStreamToByteBuffer(source, SINGLE_FILE_BUFFER_SIZE)); - } catch (IOException e) { - logger.log(Level.WARNING, "error reading input (ignored)", e); - } finally { - try { - source.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "error closing input stream (ignored)", e); + for (PhoneMetadata metadata : metadataList) { + String regionCode = metadata.getId(); + int countryCallingCode = metadata.getCountryCode(); + boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); + if (isNonGeoRegion) { + countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); + } else { + regionToMetadataMap.put(regionCode, metadata); } } - return metadataCollection; } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 Binary files differindex 7e32b2bb..7c4f9daa 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_255 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 Binary files differindex a8394f75..5ab6d03f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_27 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 Binary files differindex cfd7b379..4f6f50a5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_30 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 Binary files differindex 82340deb..1999488e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_31 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 Binary files differindex d0703f81..7c60d3d6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_34 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 Binary files differindex 1ea3d71f..e857d20e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_350 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 Binary files differindex bffda86f..bd077e77 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_351 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 Binary files differindex 79b39e11..7ee05e92 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_352 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 Binary files differindex 83951fb5..dc7a5d13 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_358 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 Binary files differindex fb48aa62..6431d101 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_359 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 Binary files differindex 0994e0db..9284fb16 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_36 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 Binary files differindex 3f3689ce..a16f968b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_372 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 Binary files differindex b9d0f47d..6932076f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_373 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 Binary files differindex 7bd530d8..ef963276 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_380 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 Binary files differindex b98f0b39..37654d46 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_381 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 Binary files differindex a2f2fbe3..c6d79133 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_385 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 Binary files differindex cab13d8a..48addfeb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_43 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 Binary files differindex a5cdfdc3..4864eeb6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_44 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 Binary files differindex aca98ea6..54cc030a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_49 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 Binary files differindex 437160a4..f8b78ffb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_505 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 Binary files differindex 4be38166..1987a239 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_506 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 Binary files differindex fcd3a376..c401bf93 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_54 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 Binary files differindex 490569e3..a2075952 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_55 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 Binary files differindex 07bd92e0..da951398 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_58 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 Binary files differindex a2563d38..60201411 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_595 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 Binary files differindex 2ff5a990..7a0a3b81 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_61 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 Binary files differindex 3c041465..8763d3c0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_62 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 Binary files differindex 0c434d18..84f5a53c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_63 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 Binary files differindex 3f59b7b5..bcf3abb9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_66 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 Binary files differindex b28f198e..52d0a37d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_675 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 Binary files differindex b9a02bc5..e7f5f11d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 Binary files differindex f7996373..15209d24 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_679 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 Binary files differindex 74eba0df..5d72f0be 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_7 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 Binary files differindex 59525337..efe9684b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_81 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 Binary files differindex bae5eaa2..5c772332 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_84 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 Binary files differindex 8dc04dbd..e231e9d5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_855 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 Binary files differindex 531b6e2c..94750712 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_90 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 Binary files differindex 319d6211..f63b8ecf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_91 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 Binary files differindex 931b3e54..69584350 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_94 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 Binary files differindex 50afc445..a672784f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_95 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 Binary files differindex 1cf408c7..31d4fe03 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_971 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 Binary files differindex 6bdc92c4..01d2cb9f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_972 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 Binary files differindex 6e21214a..81d6f13b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_995 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 Binary files differindex c8d5ffa4..dd551738 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_800 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 Binary files differindex d17c8d62..8f434f28 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_808 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 Binary files differindex e8c082bd..894b6cb8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_870 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 Binary files differindex d58df564..d10e41fd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 Binary files differindex ea9ef7ec..1ae3e350 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_881 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 Binary files differindex ca49ff01..550e9a4b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 Binary files differindex 88b8a5ae..e0c66f15 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 Binary files differindex 0cd763b9..1bf712d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_888 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 Binary files differindex 0929b3fe..f5151bee 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_979 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC Binary files differindex c1878bd8..06d59619 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD Binary files differindex bfac1112..78988b4f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE Binary files differindex 3fed6695..23a8e2d3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF Binary files differindex a34ad96a..1e38dd77 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG Binary files differindex 122a2d28..cf19f85a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI Binary files differindex c8decd9e..2fb4737c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL Binary files differindex aa2ab6d8..cc43beb8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM Binary files differindex 38daaa1c..6cd5015a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO Binary files differindex 133a93b2..243033e1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR Binary files differindex e8d3d9c8..1a91aa60 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS Binary files differindex 1762bfde..030cf8ee 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT Binary files differindex 7b6813f8..528c3173 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU Binary files differindex e87facdf..2c35e5dd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW Binary files differindex bea4677d..59edc866 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX Binary files differindex 3a0163b9..32cd44fb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ Binary files differindex 32fcc1ae..80515182 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA Binary files differindex 9f7ced8a..550b49e4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB Binary files differindex 07e15523..7cf85530 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD Binary files differindex 81e9a79b..349705c2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE Binary files differindex 9cab9756..74370f97 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF Binary files differindex 1265ae9c..45f03ecd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG Binary files differindex bda39900..36a59d30 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH Binary files differindex 7700513c..96732086 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI Binary files differindex 1aa3e010..1a3442c5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ Binary files differindex ed13585d..7bcf135f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL Binary files differindex 25c83186..fe4139aa 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM Binary files differindex 31659662..56c05de1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN Binary files differindex b8d90015..2af84ab4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO Binary files differindex a17a92b6..025a2617 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ Binary files differindex 7825f44e..9ee6d9f0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR Binary files differindex 9d1f45ce..f6d3a1f1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS Binary files differindex 87b790b7..440f6242 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT Binary files differindex 4790935c..21d17813 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW Binary files differindex d59df846..b95a873e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY Binary files differindex 63c20628..7696797f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ Binary files differindex f6ad5c1a..3a9eaac1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex 690e6d80..ebb127ad 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC Binary files differindex b4fc272f..6ce90131 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD Binary files differindex cf0004f0..0a069cef 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF Binary files differindex 456b2a34..ddd2cdfd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG Binary files differindex f1cb4eb7..d3e80dae 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH Binary files differindex 144c6ebe..f8952993 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI Binary files differindex 6c8e4efa..f4c1bd1e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK Binary files differindex 0a2c5e82..8620374a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL Binary files differindex 21f89d88..0f0b7c2b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM Binary files differindex 8d458be2..c4c6ae19 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN Binary files differindex 6c3815b7..fba893ed 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO Binary files differindex eba5a7bd..96075d2c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR Binary files differindex 06034b74..ff2bfff8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU Binary files differindex 38836643..586226b2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV Binary files differindex bea6d98a..f285ad11 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW Binary files differindex 96c787ac..c0f87362 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX Binary files differindex 81e9a311..6da44fb9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY Binary files differindex 8b1f9daa..27df1947 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ Binary files differindex 4003d75a..d888c3c1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE Binary files differindex fbaad08d..8594987f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ Binary files differindex 0a69eb8a..df52fa88 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK Binary files differindex 0f0a954c..b46f8ca4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM Binary files differindex 020d81b4..0efc9924 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO Binary files differindex 81cbb5ad..a5f2ae34 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ Binary files differindex 93eb0325..c90f9d5c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC Binary files differindex 9beb7d23..fa11c733 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE Binary files differindex 45c53c65..adf90fa8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG Binary files differindex f98dde25..abba494a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH Binary files differindex 54840122..fb7c7f47 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER Binary files differindex b9f7028c..3493c4a2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ER diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES Binary files differindex f31856ef..c4d98896 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET Binary files differindex f26f873f..a17b030f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI Binary files differindex 0da76921..ec2d9589 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ Binary files differindex 17da1054..b47ac8f7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK Binary files differindex 0b8ff8f1..7792393d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM Binary files differindex ec4f6344..c5bb1641 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO Binary files differindex 2a3c8a42..a1735d3b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR Binary files differindex c27b0079..c7bdc8a7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA Binary files differindex 8513d528..a086ea1b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB Binary files differindex d31f4808..7f33b9b1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD Binary files differindex 9116ebcb..59228347 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE Binary files differindex 27548408..25412b4e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF Binary files differindex 76ea09d7..ff2ed91f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG Binary files differindex 17aa02e3..2e79234d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH Binary files differindex 6f2a0887..901d822b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI Binary files differindex 3fef3017..8eabaa6f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL Binary files differindex b9c885aa..e4e91a3f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM Binary files differindex 402e5e22..81bc9ce3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN Binary files differindex 357c2f02..305a0a30 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP Binary files differindex 8799e47f..019e38f0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ Binary files differindex bed4f181..be34bae0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR Binary files differindex 010b08f0..4a655219 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT Binary files differindex 0e66b7fa..2451e16a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU Binary files differindex ec96aae0..0c45ef6a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW Binary files differindex 737b6ebd..d4d061f1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY Binary files differindex 6efcfab6..9e4a0594 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK Binary files differindex aa348cb1..d5b5a20e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN Binary files differindex b0f61db0..9ae12b9c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR Binary files differindex 8aab20bb..addda3a2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT Binary files differindex c8d1d5fa..9fb5a7bb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU Binary files differindex ae834a8a..cb1eb60c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID Binary files differindex a6f6d7cd..844c4c52 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE Binary files differindex 09746144..b4d3a108 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL Binary files differindex fa66a439..c3b0d2c8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM Binary files differindex d03d54b9..2e6cc685 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN Binary files differindex 16ce8055..233d9698 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO Binary files differindex 7a0aff30..811ec9a6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ Binary files differindex e0ce0c2b..020eb373 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR Binary files differindex 1f4aa7c2..80c3751e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS Binary files differindex 69c7840c..60209c00 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT Binary files differindex d40afaea..312e16e0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE Binary files differindex 8252564c..7aa280cc 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM Binary files differindex 00b6fb7a..d14f29c3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO Binary files differindex a06b3de7..1762bcd1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP Binary files differindex 3018755c..617b85d7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE Binary files differindex 3f090b0f..859fc28e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG Binary files differindex 90c99e5d..01c777db 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH Binary files differindex d613ba53..51cd3d1d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI Binary files differindex afdd07c9..eef2315d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM Binary files differindex f77db732..4b50eb59 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN Binary files differindex 3de9458d..b70a2197 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP Binary files differindex ed9ca6d6..eeb0d20f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR Binary files differindex fbf6919a..9558689d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW Binary files differindex 11e2f67c..68ff9bb0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY Binary files differindex 58f8997b..95165429 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ Binary files differindex d27d765f..2fd94d0e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA Binary files differindex 77b03c30..907e8eae 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB Binary files differindex e581024e..30ef3302 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC Binary files differindex bf87478c..79633260 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI Binary files differindex de0a7f32..9296aecb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK Binary files differindex 5229b08c..7370f609 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR Binary files differindex e74f064f..a67fb982 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS Binary files differindex 51e44360..fa569e25 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT Binary files differindex 293e570e..c35889e0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU Binary files differindex 1a6159a5..b45028cb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV Binary files differindex aff0d8ac..67a90330 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY Binary files differindex 87d5b7b6..d02ab180 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA Binary files differindex faa1b92e..b5779ac6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC Binary files differindex 7b21de82..55a213cb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD Binary files differindex 0e181e2e..ac53564b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME Binary files differindex c4752c7a..0209cdec 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ME diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF Binary files differindex 85534b98..1c411031 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG Binary files differindex 7c1109ee..4be38623 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH Binary files differindex fe2f8eee..d22bc619 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK Binary files differindex 6d067e52..dfbf3203 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML Binary files differindex f3da8d51..e6b26281 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ML diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM Binary files differindex ce3c3a2a..f55b9c16 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN Binary files differindex 7fc3dc5c..4dc239b8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO Binary files differindex 2c431d1c..f302fb6f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP Binary files differindex 1081beaa..52e25b8a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ Binary files differindex da0b5691..874d1369 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR Binary files differindex 6b3891e9..79914889 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS Binary files differindex 97ea8efe..dc6aec10 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT Binary files differindex 9f4ff69e..33ed28d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU Binary files differindex 89674400..b1afdc0b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV Binary files differindex 1864b4a0..72ade39c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW Binary files differindex e10d74a4..46ba7161 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX Binary files differindex 267bd729..9b7ed163 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY Binary files differindex 3c3a9133..8cc82c0b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ Binary files differindex ba7d7622..30b630d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA Binary files differindex 84098ce7..b4ad6c9a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC Binary files differindex b4a00fc0..9448ef13 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE Binary files differindex ca1b8809..94cfbd6d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF Binary files differindex 2b8d8ca1..fb7a27ad 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG Binary files differindex 0520cbab..26c6a661 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI Binary files differindex a346663a..d193df2f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL Binary files differindex e74d23ec..dc3b99c6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO Binary files differindex 643ca914..0789050b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP Binary files differindex fa21ba0d..4cc0540c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR Binary files differindex ae7cff03..675edb24 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU Binary files differindex 2e2af52a..7407a2c4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ Binary files differindex 2280bf83..ae8b3104 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM Binary files differindex e2ab69d9..0b6614b8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA Binary files differindex 4ca001e5..032e12d9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE Binary files differindex 7130c273..21d246ea 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF Binary files differindex 6d78c6af..0f51df38 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG Binary files differindex ca9dcbad..d8e9fb6e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH Binary files differindex c0cf3643..7f74aea1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK Binary files differindex ebc0d913..7c95b377 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL Binary files differindex ee40a831..8eebf08c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM Binary files differindex 3b54a741..84d8d006 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR Binary files differindex 1879c811..12de93d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS Binary files differindex 3f011495..7a4f4490 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT Binary files differindex e0478c03..7cdefab7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW Binary files differindex ed6d8297..c78f3f8c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY Binary files differindex 3b44fa5c..4c023000 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA Binary files differindex 3394f13d..3a809687 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE Binary files differindex 26dd0c45..8cdb151e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO Binary files differindex 01c62caf..7a5f675d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS Binary files differindex 709b19be..c6719054 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU Binary files differindex 50a6e6c6..f2e9dfc5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW Binary files differindex 2440e11a..78c0c399 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA Binary files differindex f60c95d0..7121f036 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB Binary files differindex 860a62f7..d4c4a1eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC Binary files differindex 0b8c108f..c9ab7bf1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD Binary files differindex a483c1ec..b1c18197 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE Binary files differindex fafe8d68..2b83aa55 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG Binary files differindex 1c0e6a2c..c176e1b5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH Binary files differindex c8d6f823..c65b7851 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI Binary files differindex 1d2b9e73..213809d9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ Binary files differindex 2a006424..d6b5da2f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK Binary files differindex c642a83a..2e825222 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL Binary files differindex f2f231b9..b3bd72ee 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM Binary files differindex 6c2df8f2..99abc501 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN Binary files differindex 83fe3a16..c9300344 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO Binary files differindex bf98eef5..0f3a4918 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR Binary files differindex 9d3d88e5..1cbadd06 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS Binary files differindex d6ab3936..22af2918 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST Binary files differindex 1736256b..4b02e5d6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV Binary files differindex fbc8cd62..06e019d6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX Binary files differindex 80ae038e..57c5acd9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY Binary files differindex f61fd9d9..d099d141 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ Binary files differindex 3fccaea9..06ee7a69 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA Binary files differindex 5359335c..94ea084d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC Binary files differindex 5e045019..eb21bba3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD Binary files differindex 546dd980..c48135b0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG Binary files differindex cd6d88df..0e293cbe 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH Binary files differindex 415a87d3..e6950ed4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ Binary files differindex 43b8accb..c33fddaf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK Binary files differindex 3b216e7e..b78c16ff 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL Binary files differindex 2afdf562..4b981261 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM Binary files differindex daa26251..3423cdb5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN Binary files differindex 4eece03c..f619fc09 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO Binary files differindex fe9ea53f..6022c49b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR Binary files differindex 55d9cdd1..da111358 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT Binary files differindex 75e974c5..c5bdb72e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV Binary files differindex 36947304..8b5e3704 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW Binary files differindex 77446e35..21e17d50 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ Binary files differindex e520fee3..fddf6c47 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA Binary files differindex af44a6ba..2c8b86c3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG Binary files differindex 99a51557..658338da 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US Binary files differindex a8fdf10f..c85b9ae0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY Binary files differindex 34677205..b12ec528 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ Binary files differindex 38273b62..fe878893 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA Binary files differindex e9484d11..bfa0356a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC Binary files differindex 17bc40e8..bbd247f3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE Binary files differindex a1a3ad93..3697e6bf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG Binary files differindex e6da71bd..6eb1fd88 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI Binary files differindex f04e5741..8e83bddd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN Binary files differindex 55c5d6c8..9d9827d3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU Binary files differindex 818cca84..fb52724d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF Binary files differindex 15de7fed..192f85b6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS Binary files differindex 73fdc760..b68ec5bf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_WS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE Binary files differindex 88b4749a..acca926a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT Binary files differindex 1dc3dd41..5d99aab5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA Binary files differindex a0ba8112..e9beec74 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM Binary files differindex e1d55445..a94420a3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW Binary files differindex 0b35a04d..40e4fd9d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC Binary files differindex 74ffcdcc..3dea590c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD Binary files differindex f24df335..a45bbb75 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE Binary files differindex fbcfefc9..5bbc6dfe 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF Binary files differindex 3788b26d..38212a31 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG Binary files differindex 78ae869f..975779f5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI Binary files differindex e7e5bff1..bd88c285 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL Binary files differindex 8ea4ce80..20aa7bb6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM Binary files differindex 63522938..31e46c10 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO Binary files differindex 310df7fa..22ad3f65 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR Binary files differindex 8a9daf15..3e570916 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS Binary files differindex a27ffe7f..16b9fff9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT Binary files differindex 304c1a29..42feb964 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU Binary files differindex d209247b..f572a64f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW Binary files differindex f3ffda49..79fc45c0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX Binary files differindex 565fcb51..2aa1773b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ Binary files differindex c3a7dc4e..36f53ad5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA Binary files differindex 33520ea1..48fb30db 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB Binary files differindex 269b75bf..7ed12a5a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD Binary files differindex a1983cfb..89bb7518 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE Binary files differindex 3701ff68..9f14fed9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF Binary files differindex bd050b34..74599976 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG Binary files differindex 8b926fb8..db210628 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH Binary files differindex 662b7ae2..48204d4a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI Binary files differindex 5b3dec4a..0c7a866f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ Binary files differindex 3d5f8aaf..cd723b68 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL Binary files differindex 2f404c38..68e41a12 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM Binary files differindex b373c206..dd6f8ef6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN Binary files differindex 02cabe07..fbfd8ec4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO Binary files differindex 22e77330..a63de67d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ Binary files differindex a29dd56c..77dd739a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR Binary files differindex 8072ac7e..1dad637d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS Binary files differindex 66388d79..ed4609a9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT Binary files differindex f290d2ed..561d108d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW Binary files differindex 97605039..762ee4ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY Binary files differindex 8c7e33c8..1e54cb16 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ Binary files differindex 4609c032..cf5d6706 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA Binary files differindex 60321f54..601800ae 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC Binary files differindex 9f460e27..a95e63d9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD Binary files differindex cdc47655..3129e02b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF Binary files differindex 13be56cb..6e828c85 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG Binary files differindex a87dfd0c..959f8453 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH Binary files differindex fc732e0b..18515230 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI Binary files differindex 0b01c4ac..aafce89d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK Binary files differindex 2a9df3f2..745dd900 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL Binary files differindex 6ace01af..01770d02 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM Binary files differindex e03b68f7..c08c97e6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN Binary files differindex 557fcdd5..fc1e772b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO Binary files differindex 890d0df9..ef1fa4eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR Binary files differindex d31a3714..87e65596 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU Binary files differindex e6f3a6ab..fbcc4167 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV Binary files differindex d751c2d6..998eebd7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW Binary files differindex 638e4ea3..e3ae0459 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX Binary files differindex 584ed683..42cf8d98 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY Binary files differindex 87f0f0a5..7822789e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ Binary files differindex 6788fb64..15cc9db0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE Binary files differindex 15b5a22b..d13b10eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ Binary files differindex 9570d9ae..d2e2cf77 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK Binary files differindex 0c51ecec..a7feff76 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM Binary files differindex 2937e9f9..a243358f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO Binary files differindex 02548a8d..bed984d9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ Binary files differindex fffe170b..8adb195a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC Binary files differindex dffb0c4e..bd6fb373 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE Binary files differindex cf858b78..a2add072 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG Binary files differindex 16f946ae..6c566a53 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH Binary files differindex 157e3019..1fd543eb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_EH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER Binary files differindex bd31d1a7..80819795 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES Binary files differindex 9e332872..e3466718 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ES diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET Binary files differindex 992d15f9..de8a8199 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ET diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI Binary files differindex ed0013ec..b329404f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ Binary files differindex 105990ea..eb5053c3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK Binary files differindex d06ee70a..4fc96e6b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM Binary files differindex c02c6760..899f3010 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO Binary files differindex 1032654b..2f87edee 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR Binary files differindex 781a5a22..9cd45b19 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA Binary files differindex 253da099..bcebdb31 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB Binary files differindex 0567b725..85a8eae8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD Binary files differindex 42f73e84..57a94038 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE Binary files differindex 0f035481..d5f00786 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF Binary files differindex d064d4b7..77ac3823 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG Binary files differindex 525a43ab..b69dbd67 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH Binary files differindex b58fcf3d..68991628 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI Binary files differindex 1ec43e29..5525f6d4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL Binary files differindex 5d89ce58..bd1430e6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM Binary files differindex 45580ca6..f4e1dc93 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN Binary files differindex d29e28c5..6a4b36da 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP Binary files differindex 0495da14..fb326ba7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR Binary files differindex 7e055f6a..02040dd4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT Binary files differindex ad158a95..35a99a7f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU Binary files differindex 0f971920..fa65f3b6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW Binary files differindex 2cdaa3ce..2ad73860 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY Binary files differindex 727fd90c..0725de1c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK Binary files differindex ae9d3375..fcca67f3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN Binary files differindex dcfa8e59..c1d91089 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR Binary files differindex 5fe20b66..9ef49ea4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT Binary files differindex f20c9567..32e3c8de 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU Binary files differindex 26fb3321..c06399a9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID Binary files differindex b001a74b..e7252540 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ID diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE Binary files differindex b707978c..70c05d55 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL Binary files differindex cf44a7c7..826cc645 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM Binary files differindex 0f486650..a06e48de 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN Binary files differindex 5672dc75..4a9ef2be 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ Binary files differindex a2b3e7de..1f9373f7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR Binary files differindex 8ac0ca5b..e0403a97 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS Binary files differindex ff8b2147..2fdf7624 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT Binary files differindex a6d5e6a8..7bcbdc21 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE Binary files differindex f1e1f5ba..8fea2860 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM Binary files differindex f531f3f5..f5de2f5a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO Binary files differindex 60606743..38ea92bf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP Binary files differindex 0a41f2bd..08fff356 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE Binary files differindex 67c23821..16e91612 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG Binary files differindex 645409a9..e7bdf5b7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH Binary files differindex 357e193f..a8a9bd1f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI Binary files differindex ad6ff09d..80a0aa6b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM Binary files differindex f007b0b5..35dadfca 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN Binary files differindex bed22feb..e7372929 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP Binary files differindex e0108aa9..5ce93640 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR Binary files differindex edb0da11..c87bb621 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW Binary files differindex b8d7ba7b..b2446459 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY Binary files differindex 2021fd6c..a64d89c6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ Binary files differindex fdd15244..23ee5727 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA Binary files differindex a0db8e73..6478104c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB Binary files differindex 461f7853..1c5858a8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC Binary files differindex dccb2145..c3bb4cb1 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI Binary files differindex 75cbf63c..64dbc287 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK Binary files differindex f7a3bf53..6e481a43 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR Binary files differindex 865909b2..33710050 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS Binary files differindex 1402e1b3..8aa07444 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT Binary files differindex f24cd392..f50b8926 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU Binary files differindex 73dfe0c1..fc674776 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV Binary files differindex 55065ba8..915764a3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY Binary files differindex da6addd4..39e3992f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA Binary files differindex b72a0cb9..2b8d16b6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC Binary files differindex 40b9d7bb..529230d3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD Binary files differindex 54c4b90b..03634d16 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME Binary files differindex 7fd5a28b..8b825179 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ME diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF Binary files differindex b1fa010c..6bd7e04c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG Binary files differindex 9fb191b3..95e41da8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH Binary files differindex c0c09600..2b9ea51a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK Binary files differindex cf8e304e..25f54dd3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML Binary files differindex 21b14db7..0c82380c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ML diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM Binary files differindex 22ea7224..fc113f31 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN Binary files differindex 5ab339b8..2119e3e8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO Binary files differindex d1528324..1040888f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP Binary files differindex a34c3f04..d8917d7d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ Binary files differindex f6ec8c75..865d1e59 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MQ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR Binary files differindex e2c2542b..01e47d0c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS Binary files differindex 38fb6c94..d50d6731 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT Binary files differindex 4c923cbb..aaebe77c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU Binary files differindex ab8083e6..fbbc863e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV Binary files differindex 95dc6e3a..d6b201a3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW Binary files differindex 91bafccd..2838c135 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX Binary files differindex dc5de200..3d3f45d7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY Binary files differindex e49f8113..9f7e3494 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ Binary files differindex fbd9affe..8839ea3f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA Binary files differindex e86b9ceb..28d941bf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC Binary files differindex 2c538915..d8ec9e11 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE Binary files differindex d771aa15..6c98019b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF Binary files differindex 469c0aa3..1b8e2711 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG Binary files differindex 4765e574..24ecb770 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI Binary files differindex 0e644247..e87a268b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL Binary files differindex b7c82f65..e1575705 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO Binary files differindex 82318904..6428caff 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP Binary files differindex f4b2a097..20cb1a81 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR Binary files differindex 5a471fd3..fd5ca97b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU Binary files differindex e225d925..edf51559 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ Binary files differindex ab3f5254..e96a67e7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM Binary files differindex 01fb50d5..8eb00719 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_OM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA Binary files differindex fbcf2983..980d4909 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE Binary files differindex d52f09dd..6d7d8bb6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF Binary files differindex 2bc0ee23..41ab3dca 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG Binary files differindex db09b2bf..5b41c33d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH Binary files differindex c89463ca..33ad6a02 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK Binary files differindex f0aa8a42..4abf46d8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL Binary files differindex 3561642b..0ae25145 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM Binary files differindex f4adb431..f2bfe1f4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR Binary files differindex 0b237f00..a07a07bd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT Binary files differindex cda1278c..355988ee 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW Binary files differindex c6440cd8..2b57a225 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY Binary files differindex b5930495..32526472 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA Binary files differindex 574a4f46..dd44334a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE Binary files differindex 924f8388..19558baf 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO Binary files differindex 24e8a54f..fc00dfa4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS Binary files differindex 85048861..ad8531b0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU Binary files differindex 71da7531..d3559a93 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW Binary files differindex 1f02df86..54db8157 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_RW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA Binary files differindex 1af3a30d..24f9bdf7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB Binary files differindex f067ce04..a6a8b03f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC Binary files differindex 983acb84..f80964ad 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD Binary files differindex 193fe6b7..50e23e7f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE Binary files differindex 4dba0dae..9eeff846 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG Binary files differindex 3b2ddf5b..6c15300a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH Binary files differindex e7bf39ca..a6af740a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI Binary files differindex fa6214f8..65a3a5ef 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ Binary files differindex 71d22bda..bfc5612f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK Binary files differindex a4cdcb57..d80bf275 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL Binary files differindex f4270f18..f4d57e10 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM Binary files differindex 9957c8fa..1d5ef4dc 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN Binary files differindex a5cd1c3a..1902a563 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO Binary files differindex c5f6cdbd..90b23de8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR Binary files differindex e7bae5d4..10a3b013 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST Binary files differindex 097b246b..d25e3087 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ST diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV Binary files differindex 4b1f16d9..11c9282e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX Binary files differindex afa6a860..53df3160 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY Binary files differindex b2118eb9..8638c3ff 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ Binary files differindex fa0cba52..94d4b94f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC Binary files differindex 3f9db425..a3ece84b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD Binary files differindex 96aa8a11..760d2114 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG Binary files differindex 16ed6c70..d7e1910e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH Binary files differindex 11b3296e..9ff0ca44 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ Binary files differindex 51a8727f..17e0c923 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TJ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL Binary files differindex 1dabb417..26cd38e9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM Binary files differindex ded3a7c1..1c8ac3d9 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN Binary files differindex 992b3718..9368cc4e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO Binary files differindex 5a36936e..a72b863e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR Binary files differindex 1bb44352..869c121c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT Binary files differindex 1c67e2b4..0b710135 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV Binary files differindex 40e53103..4135f706 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW Binary files differindex 846f0185..6dfce011 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ Binary files differindex 0c67e673..1e0572d3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA Binary files differindex 58a31df2..c10cb136 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG Binary files differindex b7b68399..c3a24b74 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US Binary files differindex 5b5cd668..9a3f862c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY Binary files differindex 7dc561d5..79de6f8b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ Binary files differindex febccc90..0d23be4d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_UZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA Binary files differindex a170b283..dfab49ff 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC Binary files differindex b5b54580..23228e33 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE Binary files differindex e9a731ec..0722459c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG Binary files differindex aac109ba..7b22a386 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI Binary files differindex 5e6e6df8..6cf76229 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN Binary files differindex 136a0772..555e7622 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU Binary files differindex a6ab9eea..d5efdac7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_VU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF Binary files differindex fc5bcb22..d5675c74 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS Binary files differindex 686c1893..e8545221 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_WS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE Binary files differindex dcdd8dfa..3d559e49 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT Binary files differindex 60a6a334..026b3404 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_YT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA Binary files differindex 2e639e00..c63b9477 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM Binary files differindex f0e5edbd..33083f19 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW Binary files differindex 77fcbd62..b6ebb295 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto b/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto Binary files differdeleted file mode 100644 index a6d902d2..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto +++ /dev/null diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java index ac201366..38319cbb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers.internal; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; /** * Internal phonenumber matching API used to isolate the underlying implementation of the diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java index b1e7a23f..125a1822 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/internal/RegexBasedMatcher.java @@ -16,8 +16,8 @@ package com.google.i18n.phonenumbers.internal; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.RegexCache; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.regex.Matcher; @@ -38,7 +38,7 @@ public final class RegexBasedMatcher implements MatcherApi { public boolean matchesNationalNumber(String nationalNumber, PhoneNumberDesc numberDesc, boolean allowPrefixMatch) { Matcher nationalNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.nationalNumberPattern).matcher(nationalNumber); + numberDesc.getNationalNumberPattern()).matcher(nationalNumber); return nationalNumberPatternMatcher.matches() || (allowPrefixMatch && nationalNumberPatternMatcher.lookingAt()); } @@ -46,7 +46,7 @@ public final class RegexBasedMatcher implements MatcherApi { // @Override public boolean matchesPossibleNumber(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = regexCache.getPatternForRegex( - numberDesc.possibleNumberPattern).matcher(nationalNumber); + numberDesc.getPossibleNumberPattern()).matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java deleted file mode 100644 index abf4a67b..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java +++ /dev/null @@ -1,1040 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! - -package com.google.i18n.phonenumbers.nano; - -@SuppressWarnings("hiding") -public interface Phonemetadata { - - public static final class NumberFormat extends - com.google.protobuf.nano.MessageNano { - - private static volatile NumberFormat[] _emptyArray; - public static NumberFormat[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new NumberFormat[0]; - } - } - } - return _emptyArray; - } - - // required string pattern = 1; - public java.lang.String pattern; - - // required string format = 2; - public java.lang.String format; - - // repeated string leading_digits_pattern = 3; - public java.lang.String[] leadingDigitsPattern; - - // optional string national_prefix_formatting_rule = 4; - public java.lang.String nationalPrefixFormattingRule; - - // optional bool national_prefix_optional_when_formatting = 6; - public boolean nationalPrefixOptionalWhenFormatting; - - // optional string domestic_carrier_code_formatting_rule = 5; - public java.lang.String domesticCarrierCodeFormattingRule; - - public NumberFormat() { - clear(); - } - - public NumberFormat clear() { - pattern = ""; - format = ""; - leadingDigitsPattern = com.google.protobuf.nano.WireFormatNano.EMPTY_STRING_ARRAY; - nationalPrefixFormattingRule = ""; - nationalPrefixOptionalWhenFormatting = false; - domesticCarrierCodeFormattingRule = ""; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - output.writeString(1, this.pattern); - output.writeString(2, this.format); - if (this.leadingDigitsPattern != null && this.leadingDigitsPattern.length > 0) { - for (int i = 0; i < this.leadingDigitsPattern.length; i++) { - java.lang.String element = this.leadingDigitsPattern[i]; - if (element != null) { - output.writeString(3, element); - } - } - } - if (!this.nationalPrefixFormattingRule.equals("")) { - output.writeString(4, this.nationalPrefixFormattingRule); - } - if (!this.domesticCarrierCodeFormattingRule.equals("")) { - output.writeString(5, this.domesticCarrierCodeFormattingRule); - } - if (this.nationalPrefixOptionalWhenFormatting != false) { - output.writeBool(6, this.nationalPrefixOptionalWhenFormatting); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(1, this.pattern); - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(2, this.format); - if (this.leadingDigitsPattern != null && this.leadingDigitsPattern.length > 0) { - int dataCount = 0; - int dataSize = 0; - for (int i = 0; i < this.leadingDigitsPattern.length; i++) { - java.lang.String element = this.leadingDigitsPattern[i]; - if (element != null) { - dataCount++; - dataSize += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSizeNoTag(element); - } - } - size += dataSize; - size += 1 * dataCount; - } - if (!this.nationalPrefixFormattingRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(4, this.nationalPrefixFormattingRule); - } - if (!this.domesticCarrierCodeFormattingRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(5, this.domesticCarrierCodeFormattingRule); - } - if (this.nationalPrefixOptionalWhenFormatting != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(6, this.nationalPrefixOptionalWhenFormatting); - } - return size; - } - - @Override - public NumberFormat mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - this.pattern = input.readString(); - break; - } - case 18: { - this.format = input.readString(); - break; - } - case 26: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 26); - int i = this.leadingDigitsPattern == null ? 0 : this.leadingDigitsPattern.length; - java.lang.String[] newArray = new java.lang.String[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.leadingDigitsPattern, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = input.readString(); - input.readTag(); - } - // Last one without readTag. - newArray[i] = input.readString(); - this.leadingDigitsPattern = newArray; - break; - } - case 34: { - this.nationalPrefixFormattingRule = input.readString(); - break; - } - case 42: { - this.domesticCarrierCodeFormattingRule = input.readString(); - break; - } - case 48: { - this.nationalPrefixOptionalWhenFormatting = input.readBool(); - break; - } - } - } - } - - public static NumberFormat parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new NumberFormat(), data); - } - - public static NumberFormat parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new NumberFormat().mergeFrom(input); - } - } - - public static final class PhoneNumberDesc extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneNumberDesc[] _emptyArray; - public static PhoneNumberDesc[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneNumberDesc[0]; - } - } - } - return _emptyArray; - } - - // optional string national_number_pattern = 2; - public java.lang.String nationalNumberPattern; - - // optional string possible_number_pattern = 3; - public java.lang.String possibleNumberPattern; - - // optional string example_number = 6; - public java.lang.String exampleNumber; - - public PhoneNumberDesc() { - clear(); - } - - public PhoneNumberDesc clear() { - nationalNumberPattern = ""; - possibleNumberPattern = ""; - exampleNumber = ""; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (!this.nationalNumberPattern.equals("")) { - output.writeString(2, this.nationalNumberPattern); - } - if (!this.possibleNumberPattern.equals("")) { - output.writeString(3, this.possibleNumberPattern); - } - if (!this.exampleNumber.equals("")) { - output.writeString(6, this.exampleNumber); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (!this.nationalNumberPattern.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(2, this.nationalNumberPattern); - } - if (!this.possibleNumberPattern.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(3, this.possibleNumberPattern); - } - if (!this.exampleNumber.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(6, this.exampleNumber); - } - return size; - } - - @Override - public PhoneNumberDesc mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 18: { - this.nationalNumberPattern = input.readString(); - break; - } - case 26: { - this.possibleNumberPattern = input.readString(); - break; - } - case 50: { - this.exampleNumber = input.readString(); - break; - } - } - } - } - - public static PhoneNumberDesc parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneNumberDesc(), data); - } - - public static PhoneNumberDesc parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneNumberDesc().mergeFrom(input); - } - } - - public static final class PhoneMetadata extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneMetadata[] _emptyArray; - public static PhoneMetadata[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneMetadata[0]; - } - } - } - return _emptyArray; - } - - // optional .i18n.phonenumbers.PhoneNumberDesc general_desc = 1; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc generalDesc; - - // optional .i18n.phonenumbers.PhoneNumberDesc fixed_line = 2; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc fixedLine; - - // optional .i18n.phonenumbers.PhoneNumberDesc mobile = 3; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc mobile; - - // optional .i18n.phonenumbers.PhoneNumberDesc toll_free = 4; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc tollFree; - - // optional .i18n.phonenumbers.PhoneNumberDesc premium_rate = 5; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc premiumRate; - - // optional .i18n.phonenumbers.PhoneNumberDesc shared_cost = 6; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc sharedCost; - - // optional .i18n.phonenumbers.PhoneNumberDesc personal_number = 7; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc personalNumber; - - // optional .i18n.phonenumbers.PhoneNumberDesc voip = 8; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc voip; - - // optional .i18n.phonenumbers.PhoneNumberDesc pager = 21; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc pager; - - // optional .i18n.phonenumbers.PhoneNumberDesc uan = 25; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc uan; - - // optional .i18n.phonenumbers.PhoneNumberDesc emergency = 27; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc emergency; - - // optional .i18n.phonenumbers.PhoneNumberDesc voicemail = 28; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc voicemail; - - // optional .i18n.phonenumbers.PhoneNumberDesc short_code = 29; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc shortCode; - - // optional .i18n.phonenumbers.PhoneNumberDesc standard_rate = 30; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc standardRate; - - // optional .i18n.phonenumbers.PhoneNumberDesc carrier_specific = 31; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc carrierSpecific; - - // optional .i18n.phonenumbers.PhoneNumberDesc no_international_dialling = 24; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc noInternationalDialling; - - // required string id = 9; - public java.lang.String id; - - // optional int32 country_code = 10; - public int countryCode; - - // optional string international_prefix = 11; - public java.lang.String internationalPrefix; - - // optional string preferred_international_prefix = 17; - public java.lang.String preferredInternationalPrefix; - - // optional string national_prefix = 12; - public java.lang.String nationalPrefix; - - // optional string preferred_extn_prefix = 13; - public java.lang.String preferredExtnPrefix; - - // optional string national_prefix_for_parsing = 15; - public java.lang.String nationalPrefixForParsing; - - // optional string national_prefix_transform_rule = 16; - public java.lang.String nationalPrefixTransformRule; - - // optional bool same_mobile_and_fixed_line_pattern = 18 [default = false]; - public boolean sameMobileAndFixedLinePattern; - - // repeated .i18n.phonenumbers.NumberFormat number_format = 19; - public com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] numberFormat; - - // repeated .i18n.phonenumbers.NumberFormat intl_number_format = 20; - public com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] intlNumberFormat; - - // optional bool main_country_for_code = 22 [default = false]; - public boolean mainCountryForCode; - - // optional string leading_digits = 23; - public java.lang.String leadingDigits; - - // optional bool leading_zero_possible = 26 [default = false]; - public boolean leadingZeroPossible; - - // optional bool mobile_number_portable_region = 32 [default = false]; - public boolean mobileNumberPortableRegion; - - public PhoneMetadata() { - clear(); - } - - public PhoneMetadata clear() { - generalDesc = null; - fixedLine = null; - mobile = null; - tollFree = null; - premiumRate = null; - sharedCost = null; - personalNumber = null; - voip = null; - pager = null; - uan = null; - emergency = null; - voicemail = null; - shortCode = null; - standardRate = null; - carrierSpecific = null; - noInternationalDialling = null; - id = ""; - countryCode = 0; - internationalPrefix = ""; - preferredInternationalPrefix = ""; - nationalPrefix = ""; - preferredExtnPrefix = ""; - nationalPrefixForParsing = ""; - nationalPrefixTransformRule = ""; - sameMobileAndFixedLinePattern = false; - numberFormat = com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat.emptyArray(); - intlNumberFormat = com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat.emptyArray(); - mainCountryForCode = false; - leadingDigits = ""; - leadingZeroPossible = false; - mobileNumberPortableRegion = false; - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (this.generalDesc != null) { - output.writeMessage(1, this.generalDesc); - } - if (this.fixedLine != null) { - output.writeMessage(2, this.fixedLine); - } - if (this.mobile != null) { - output.writeMessage(3, this.mobile); - } - if (this.tollFree != null) { - output.writeMessage(4, this.tollFree); - } - if (this.premiumRate != null) { - output.writeMessage(5, this.premiumRate); - } - if (this.sharedCost != null) { - output.writeMessage(6, this.sharedCost); - } - if (this.personalNumber != null) { - output.writeMessage(7, this.personalNumber); - } - if (this.voip != null) { - output.writeMessage(8, this.voip); - } - output.writeString(9, this.id); - if (this.countryCode != 0) { - output.writeInt32(10, this.countryCode); - } - if (!this.internationalPrefix.equals("")) { - output.writeString(11, this.internationalPrefix); - } - if (!this.nationalPrefix.equals("")) { - output.writeString(12, this.nationalPrefix); - } - if (!this.preferredExtnPrefix.equals("")) { - output.writeString(13, this.preferredExtnPrefix); - } - if (!this.nationalPrefixForParsing.equals("")) { - output.writeString(15, this.nationalPrefixForParsing); - } - if (!this.nationalPrefixTransformRule.equals("")) { - output.writeString(16, this.nationalPrefixTransformRule); - } - if (!this.preferredInternationalPrefix.equals("")) { - output.writeString(17, this.preferredInternationalPrefix); - } - if (this.sameMobileAndFixedLinePattern != false) { - output.writeBool(18, this.sameMobileAndFixedLinePattern); - } - if (this.numberFormat != null && this.numberFormat.length > 0) { - for (int i = 0; i < this.numberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.numberFormat[i]; - if (element != null) { - output.writeMessage(19, element); - } - } - } - if (this.intlNumberFormat != null && this.intlNumberFormat.length > 0) { - for (int i = 0; i < this.intlNumberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.intlNumberFormat[i]; - if (element != null) { - output.writeMessage(20, element); - } - } - } - if (this.pager != null) { - output.writeMessage(21, this.pager); - } - if (this.mainCountryForCode != false) { - output.writeBool(22, this.mainCountryForCode); - } - if (!this.leadingDigits.equals("")) { - output.writeString(23, this.leadingDigits); - } - if (this.noInternationalDialling != null) { - output.writeMessage(24, this.noInternationalDialling); - } - if (this.uan != null) { - output.writeMessage(25, this.uan); - } - if (this.leadingZeroPossible != false) { - output.writeBool(26, this.leadingZeroPossible); - } - if (this.emergency != null) { - output.writeMessage(27, this.emergency); - } - if (this.voicemail != null) { - output.writeMessage(28, this.voicemail); - } - if (this.shortCode != null) { - output.writeMessage(29, this.shortCode); - } - if (this.standardRate != null) { - output.writeMessage(30, this.standardRate); - } - if (this.carrierSpecific != null) { - output.writeMessage(31, this.carrierSpecific); - } - if (this.mobileNumberPortableRegion != false) { - output.writeBool(32, this.mobileNumberPortableRegion); - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (this.generalDesc != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(1, this.generalDesc); - } - if (this.fixedLine != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(2, this.fixedLine); - } - if (this.mobile != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(3, this.mobile); - } - if (this.tollFree != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(4, this.tollFree); - } - if (this.premiumRate != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(5, this.premiumRate); - } - if (this.sharedCost != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(6, this.sharedCost); - } - if (this.personalNumber != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(7, this.personalNumber); - } - if (this.voip != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(8, this.voip); - } - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(9, this.id); - if (this.countryCode != 0) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeInt32Size(10, this.countryCode); - } - if (!this.internationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(11, this.internationalPrefix); - } - if (!this.nationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(12, this.nationalPrefix); - } - if (!this.preferredExtnPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(13, this.preferredExtnPrefix); - } - if (!this.nationalPrefixForParsing.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(15, this.nationalPrefixForParsing); - } - if (!this.nationalPrefixTransformRule.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(16, this.nationalPrefixTransformRule); - } - if (!this.preferredInternationalPrefix.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(17, this.preferredInternationalPrefix); - } - if (this.sameMobileAndFixedLinePattern != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(18, this.sameMobileAndFixedLinePattern); - } - if (this.numberFormat != null && this.numberFormat.length > 0) { - for (int i = 0; i < this.numberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.numberFormat[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(19, element); - } - } - } - if (this.intlNumberFormat != null && this.intlNumberFormat.length > 0) { - for (int i = 0; i < this.intlNumberFormat.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat element = this.intlNumberFormat[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(20, element); - } - } - } - if (this.pager != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(21, this.pager); - } - if (this.mainCountryForCode != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(22, this.mainCountryForCode); - } - if (!this.leadingDigits.equals("")) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeStringSize(23, this.leadingDigits); - } - if (this.noInternationalDialling != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(24, this.noInternationalDialling); - } - if (this.uan != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(25, this.uan); - } - if (this.leadingZeroPossible != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(26, this.leadingZeroPossible); - } - if (this.emergency != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(27, this.emergency); - } - if (this.voicemail != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(28, this.voicemail); - } - if (this.shortCode != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(29, this.shortCode); - } - if (this.standardRate != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(30, this.standardRate); - } - if (this.carrierSpecific != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(31, this.carrierSpecific); - } - if (this.mobileNumberPortableRegion != false) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeBoolSize(32, this.mobileNumberPortableRegion); - } - return size; - } - - @Override - public PhoneMetadata mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - if (this.generalDesc == null) { - this.generalDesc = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.generalDesc); - break; - } - case 18: { - if (this.fixedLine == null) { - this.fixedLine = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.fixedLine); - break; - } - case 26: { - if (this.mobile == null) { - this.mobile = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.mobile); - break; - } - case 34: { - if (this.tollFree == null) { - this.tollFree = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.tollFree); - break; - } - case 42: { - if (this.premiumRate == null) { - this.premiumRate = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.premiumRate); - break; - } - case 50: { - if (this.sharedCost == null) { - this.sharedCost = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.sharedCost); - break; - } - case 58: { - if (this.personalNumber == null) { - this.personalNumber = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.personalNumber); - break; - } - case 66: { - if (this.voip == null) { - this.voip = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.voip); - break; - } - case 74: { - this.id = input.readString(); - break; - } - case 80: { - this.countryCode = input.readInt32(); - break; - } - case 90: { - this.internationalPrefix = input.readString(); - break; - } - case 98: { - this.nationalPrefix = input.readString(); - break; - } - case 106: { - this.preferredExtnPrefix = input.readString(); - break; - } - case 122: { - this.nationalPrefixForParsing = input.readString(); - break; - } - case 130: { - this.nationalPrefixTransformRule = input.readString(); - break; - } - case 138: { - this.preferredInternationalPrefix = input.readString(); - break; - } - case 144: { - this.sameMobileAndFixedLinePattern = input.readBool(); - break; - } - case 154: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 154); - int i = this.numberFormat == null ? 0 : this.numberFormat.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.numberFormat, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - this.numberFormat = newArray; - break; - } - case 162: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 162); - int i = this.intlNumberFormat == null ? 0 : this.intlNumberFormat.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.intlNumberFormat, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat(); - input.readMessage(newArray[i]); - this.intlNumberFormat = newArray; - break; - } - case 170: { - if (this.pager == null) { - this.pager = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.pager); - break; - } - case 176: { - this.mainCountryForCode = input.readBool(); - break; - } - case 186: { - this.leadingDigits = input.readString(); - break; - } - case 194: { - if (this.noInternationalDialling == null) { - this.noInternationalDialling = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.noInternationalDialling); - break; - } - case 202: { - if (this.uan == null) { - this.uan = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.uan); - break; - } - case 208: { - this.leadingZeroPossible = input.readBool(); - break; - } - case 218: { - if (this.emergency == null) { - this.emergency = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.emergency); - break; - } - case 226: { - if (this.voicemail == null) { - this.voicemail = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.voicemail); - break; - } - case 234: { - if (this.shortCode == null) { - this.shortCode = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.shortCode); - break; - } - case 242: { - if (this.standardRate == null) { - this.standardRate = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.standardRate); - break; - } - case 250: { - if (this.carrierSpecific == null) { - this.carrierSpecific = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc(); - } - input.readMessage(this.carrierSpecific); - break; - } - case 256: { - this.mobileNumberPortableRegion = input.readBool(); - break; - } - } - } - } - - public static PhoneMetadata parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneMetadata(), data); - } - - public static PhoneMetadata parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneMetadata().mergeFrom(input); - } - } - - public static final class PhoneMetadataCollection extends - com.google.protobuf.nano.MessageNano { - - private static volatile PhoneMetadataCollection[] _emptyArray; - public static PhoneMetadataCollection[] emptyArray() { - // Lazily initializes the empty array - if (_emptyArray == null) { - synchronized ( - com.google.protobuf.nano.InternalNano.LAZY_INIT_LOCK) { - if (_emptyArray == null) { - _emptyArray = new PhoneMetadataCollection[0]; - } - } - } - return _emptyArray; - } - - // repeated .i18n.phonenumbers.PhoneMetadata metadata = 1; - public com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[] metadata; - - public PhoneMetadataCollection() { - clear(); - } - - public PhoneMetadataCollection clear() { - metadata = com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata.emptyArray(); - cachedSize = -1; - return this; - } - - @Override - public void writeTo(com.google.protobuf.nano.CodedOutputByteBufferNano output) - throws java.io.IOException { - if (this.metadata != null && this.metadata.length > 0) { - for (int i = 0; i < this.metadata.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata element = this.metadata[i]; - if (element != null) { - output.writeMessage(1, element); - } - } - } - super.writeTo(output); - } - - @Override - protected int computeSerializedSize() { - int size = super.computeSerializedSize(); - if (this.metadata != null && this.metadata.length > 0) { - for (int i = 0; i < this.metadata.length; i++) { - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata element = this.metadata[i]; - if (element != null) { - size += com.google.protobuf.nano.CodedOutputByteBufferNano - .computeMessageSize(1, element); - } - } - } - return size; - } - - @Override - public PhoneMetadataCollection mergeFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - while (true) { - int tag = input.readTag(); - switch (tag) { - case 0: - return this; - default: { - if (!com.google.protobuf.nano.WireFormatNano.parseUnknownField(input, tag)) { - return this; - } - break; - } - case 10: { - int arrayLength = com.google.protobuf.nano.WireFormatNano - .getRepeatedFieldArrayLength(input, 10); - int i = this.metadata == null ? 0 : this.metadata.length; - com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[] newArray = - new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata[i + arrayLength]; - if (i != 0) { - java.lang.System.arraycopy(this.metadata, 0, newArray, 0, i); - } - for (; i < newArray.length - 1; i++) { - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata(); - input.readMessage(newArray[i]); - input.readTag(); - } - // Last one without readTag. - newArray[i] = new com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata(); - input.readMessage(newArray[i]); - this.metadata = newArray; - break; - } - } - } - } - - public static PhoneMetadataCollection parseFrom(byte[] data) - throws com.google.protobuf.nano.InvalidProtocolBufferNanoException { - return com.google.protobuf.nano.MessageNano.mergeFrom(new PhoneMetadataCollection(), data); - } - - public static PhoneMetadataCollection parseFrom( - com.google.protobuf.nano.CodedInputByteBufferNano input) - throws java.io.IOException { - return new PhoneMetadataCollection().mergeFrom(input); - } - } -} diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java index 1365ac3f..2591131b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ExampleNumbersTest.java @@ -17,8 +17,8 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import junit.framework.TestCase; @@ -142,10 +142,10 @@ public class ExampleNumbersTest extends TestCase { for (String regionCode : phoneNumberUtil.getSupportedRegions()) { PhoneNumber exampleNumber = null; PhoneNumberDesc desc = - phoneNumberUtil.getMetadataForRegion(regionCode).noInternationalDialling; + phoneNumberUtil.getMetadataForRegion(regionCode).getNoInternationalDialling(); try { - if (!desc.exampleNumber.equals("")) { - exampleNumber = phoneNumberUtil.parse(desc.exampleNumber, regionCode); + if (desc.hasExampleNumber()) { + exampleNumber = phoneNumberUtil.parse(desc.getExampleNumber(), regionCode); } } catch (NumberParseException e) { LOGGER.log(Level.SEVERE, e.toString()); @@ -175,7 +175,21 @@ public class ExampleNumbersTest extends TestCase { public void testEveryRegionHasAnExampleNumber() throws Exception { for (String regionCode : phoneNumberUtil.getSupportedRegions()) { PhoneNumber exampleNumber = phoneNumberUtil.getExampleNumber(regionCode); - assertNotNull("None found for region " + regionCode, exampleNumber); + assertNotNull("No example number found for region " + regionCode, exampleNumber); + } + } + + public void testEveryRegionHasAnInvalidExampleNumber() throws Exception { + for (String regionCode : phoneNumberUtil.getSupportedRegions()) { + PhoneNumber exampleNumber = phoneNumberUtil.getInvalidExampleNumber(regionCode); + assertNotNull("No invalid example number found for region " + regionCode, exampleNumber); + } + } + + public void testEveryTypeHasAnExampleNumber() throws Exception { + for (PhoneNumberUtil.PhoneNumberType type : PhoneNumberUtil.PhoneNumberType.values()) { + PhoneNumber exampleNumber = phoneNumberUtil.getExampleNumberForType(type); + assertNotNull("No example number found for type " + type, exampleNumber); } } @@ -199,10 +213,14 @@ public class ExampleNumbersTest extends TestCase { for (ShortNumberInfo.ShortNumberCost cost : ShortNumberInfo.ShortNumberCost.values()) { exampleShortNumber = shortNumberInfo.getExampleShortNumberForCost(regionCode, cost); if (!exampleShortNumber.equals("")) { - if (cost != shortNumberInfo.getExpectedCostForRegion( - phoneNumberUtil.parse(exampleShortNumber, regionCode), regionCode)) { + phoneNumber = phoneNumberUtil.parse(exampleShortNumber, regionCode); + ShortNumberInfo.ShortNumberCost exampleShortNumberCost = + shortNumberInfo.getExpectedCostForRegion(phoneNumber, regionCode); + if (cost != exampleShortNumberCost) { wrongTypeCases.add(phoneNumber); - LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString()); + LOGGER.log(Level.SEVERE, "Wrong cost for " + phoneNumber.toString() + + ": got " + exampleShortNumberCost + + ", expected: " + cost); } } } @@ -216,9 +234,9 @@ public class ExampleNumbersTest extends TestCase { int wrongTypeCounter = 0; for (String regionCode : shortNumberInfo.getSupportedRegions()) { PhoneNumberDesc desc = - MetadataManager.getShortNumberMetadataForRegion(regionCode).emergency; - if (!desc.exampleNumber.equals("")) { - String exampleNumber = desc.exampleNumber; + MetadataManager.getShortNumberMetadataForRegion(regionCode).getEmergency(); + if (desc.hasExampleNumber()) { + String exampleNumber = desc.getExampleNumber(); PhoneNumber phoneNumber = phoneNumberUtil.parse(exampleNumber, regionCode); if (!shortNumberInfo.isPossibleShortNumberForRegion(phoneNumber, regionCode) || !shortNumberInfo.isEmergencyNumber(exampleNumber, regionCode)) { @@ -239,9 +257,9 @@ public class ExampleNumbersTest extends TestCase { for (String regionCode : shortNumberInfo.getSupportedRegions()) { // Test the carrier-specific tag. PhoneNumberDesc desc = - MetadataManager.getShortNumberMetadataForRegion(regionCode).carrierSpecific; - if (!desc.exampleNumber.equals("")) { - String exampleNumber = desc.exampleNumber; + MetadataManager.getShortNumberMetadataForRegion(regionCode).getCarrierSpecific(); + if (desc.hasExampleNumber()) { + String exampleNumber = desc.getExampleNumber(); PhoneNumber carrierSpecificNumber = phoneNumberUtil.parse(exampleNumber, regionCode); if (!shortNumberInfo.isPossibleShortNumberForRegion(carrierSpecificNumber, regionCode) || !shortNumberInfo.isCarrierSpecific(carrierSpecificNumber)) { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java index 7a4b5eca..229d8f7d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MetadataManagerTest.java @@ -16,7 +16,7 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; import junit.framework.TestCase; @@ -29,14 +29,14 @@ public class MetadataManagerTest extends TestCase { // We should have some data for Germany. PhoneMetadata germanyAlternateFormats = MetadataManager.getAlternateFormatsForCountry(49); assertNotNull(germanyAlternateFormats); - assertTrue(germanyAlternateFormats.numberFormat.length > 0); + assertTrue(germanyAlternateFormats.numberFormats().size() > 0); } public void testShortNumberMetadataContainsData() throws Exception { // We should have some data for France. PhoneMetadata franceShortNumberMetadata = MetadataManager.getShortNumberMetadataForRegion("FR"); assertNotNull(franceShortNumberMetadata); - assertTrue(franceShortNumberMetadata.shortCode != null); + assertTrue(franceShortNumberMetadata.hasShortCode()); } public void testAlternateFormatsFailsGracefully() throws Exception { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java index c1c53191..cf9bc90d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -16,6 +16,9 @@ package com.google.i18n.phonenumbers; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; + +import java.util.concurrent.ConcurrentHashMap; import junit.framework.TestCase; /** @@ -24,21 +27,38 @@ import junit.framework.TestCase; public class MultiFileMetadataSourceImplTest extends TestCase { public MultiFileMetadataSourceImplTest() {} + public void testGeographicalRegionMetadataLoadsCorrectly() { + ConcurrentHashMap<String, PhoneMetadata> map = new ConcurrentHashMap<String, PhoneMetadata>(); + PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( + "CA", map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get("CA")); + } + + public void testNonGeographicalRegionMetadataLoadsCorrectly() { + ConcurrentHashMap<Integer, PhoneMetadata> map = new ConcurrentHashMap<Integer, PhoneMetadata>(); + PhoneMetadata metadata = MultiFileMetadataSourceImpl.loadMetadataFromFile( + 800, map, "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + assertEquals(metadata, map.get(800)); + } + public void testMissingMetadataFileThrowsRuntimeException() { - MultiFileMetadataSourceImpl multiFileMetadataSource = new MultiFileMetadataSourceImpl( - "no/such/file", PhoneNumberUtil.DEFAULT_METADATA_LOADER); // In normal usage we should never get a state where we are asking to load metadata that doesn't // exist. However if the library is packaged incorrectly in the jar, this could happen and the // best we can do is make sure the exception has the file name in it. try { - multiFileMetadataSource.loadMetadataFromFile("XX", -1); + MultiFileMetadataSourceImpl.loadMetadataFromFile( + "XX", new ConcurrentHashMap<String, PhoneMetadata>(), "no/such/file", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); fail("expected exception"); } catch (RuntimeException e) { assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); } try { - multiFileMetadataSource.loadMetadataFromFile( - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123); + MultiFileMetadataSourceImpl.loadMetadataFromFile( + 123, new ConcurrentHashMap<Integer, PhoneMetadata>(), "no/such/file", + PhoneNumberUtil.DEFAULT_METADATA_LOADER); fail("expected exception"); } catch (RuntimeException e) { assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index 4f6bcaf5..e5313c7b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -17,11 +17,11 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.ArrayList; import java.util.List; @@ -132,77 +132,81 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertNull(phoneUtil.getMetadataForNonGeographicalRegion(-1)); } - private boolean exactlySame(PhoneNumberDesc first, PhoneNumberDesc second) { - return first.nationalNumberPattern.equals(second.nationalNumberPattern) && - first.possibleNumberPattern.equals(second.possibleNumberPattern) && - first.exampleNumber.equals(second.exampleNumber); - } - public void testGetInstanceLoadUSMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.US); - assertEquals("US", metadata.id); - assertEquals(1, metadata.countryCode); - assertEquals("011", metadata.internationalPrefix); - assertTrue(!metadata.nationalPrefix.equals("")); - assertEquals(2, metadata.numberFormat.length); + assertEquals("US", metadata.getId()); + assertEquals(1, metadata.getCountryCode()); + assertEquals("011", metadata.getInternationalPrefix()); + assertTrue(metadata.hasNationalPrefix()); + assertEquals(2, metadata.numberFormatSize()); assertEquals("(\\d{3})(\\d{3})(\\d{4})", - metadata.numberFormat[1].pattern); - assertEquals("$1 $2 $3", metadata.numberFormat[1].format); + metadata.getNumberFormat(1).getPattern()); + assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat()); assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", - metadata.generalDesc.nationalNumberPattern); - assertEquals("\\d{7}(?:\\d{3})?", metadata.generalDesc.possibleNumberPattern); - assertTrue(exactlySame(metadata.generalDesc, metadata.fixedLine)); - assertEquals("\\d{10}", metadata.tollFree.possibleNumberPattern); - assertEquals("900\\d{7}", metadata.premiumRate.nationalNumberPattern); + metadata.getGeneralDesc().getNationalNumberPattern()); + assertEquals("\\d{7}(?:\\d{3})?", metadata.getGeneralDesc().getPossibleNumberPattern()); + assertTrue(metadata.getGeneralDesc().exactlySameAs(metadata.getFixedLine())); + assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals(10, metadata.getGeneralDesc().getPossibleLength(0)); + // Possible lengths are the same as the general description, so aren't stored separately in the + // toll free element as well. + assertEquals(0, metadata.getTollFree().getPossibleLengthCount()); + assertEquals("900\\d{7}", metadata.getPremiumRate().getNationalNumberPattern()); // No shared-cost data is available, so it should be initialised to "NA". - assertEquals("NA", metadata.sharedCost.nationalNumberPattern); - assertEquals("NA", metadata.sharedCost.possibleNumberPattern); + assertEquals("NA", metadata.getSharedCost().getNationalNumberPattern()); + assertEquals("NA", metadata.getSharedCost().getPossibleNumberPattern()); } public void testGetInstanceLoadDEMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.DE); - assertEquals("DE", metadata.id); - assertEquals(49, metadata.countryCode); - assertEquals("00", metadata.internationalPrefix); - assertEquals("0", metadata.nationalPrefix); - assertEquals(6, metadata.numberFormat.length); - assertEquals(1, metadata.numberFormat[5].leadingDigitsPattern.length); - assertEquals("900", metadata.numberFormat[5].leadingDigitsPattern[0]); + assertEquals("DE", metadata.getId()); + assertEquals(49, metadata.getCountryCode()); + assertEquals("00", metadata.getInternationalPrefix()); + assertEquals("0", metadata.getNationalPrefix()); + assertEquals(6, metadata.numberFormatSize()); + assertEquals(1, metadata.getNumberFormat(5).leadingDigitsPatternSize()); + assertEquals("900", metadata.getNumberFormat(5).getLeadingDigitsPattern(0)); assertEquals("(\\d{3})(\\d{3,4})(\\d{4})", - metadata.numberFormat[5].pattern); - assertEquals("$1 $2 $3", metadata.numberFormat[5].format); - assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:[1-9]\\d|0[2-9]))\\d{1,8}", - metadata.fixedLine.nationalNumberPattern); - assertEquals("\\d{2,14}", metadata.fixedLine.possibleNumberPattern); - assertEquals("30123456", metadata.fixedLine.exampleNumber); - assertEquals("\\d{10}", metadata.tollFree.possibleNumberPattern); - assertEquals("900([135]\\d{6}|9\\d{7})", metadata.premiumRate.nationalNumberPattern); + metadata.getNumberFormat(5).getPattern()); + assertEquals("$1 $2 $3", metadata.getNumberFormat(5).getFormat()); + assertEquals(2, metadata.getGeneralDesc().getPossibleLengthLocalOnlyCount()); + assertEquals(8, metadata.getGeneralDesc().getPossibleLengthCount()); + // Nothing is present for fixed-line, since it is the same as the general desc, so for + // efficiency reasons we don't store an extra value. + assertEquals(0, metadata.getFixedLine().getPossibleLengthCount()); + assertEquals(2, metadata.getMobile().getPossibleLengthCount()); + assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}", + metadata.getFixedLine().getNationalNumberPattern()); + assertEquals("\\d{2,14}", metadata.getFixedLine().getPossibleNumberPattern()); + assertEquals("30123456", metadata.getFixedLine().getExampleNumber()); + assertEquals("\\d{10}", metadata.getTollFree().getPossibleNumberPattern()); + assertEquals("900([135]\\d{6}|9\\d{7})", metadata.getPremiumRate().getNationalNumberPattern()); } public void testGetInstanceLoadARMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.AR); - assertEquals("AR", metadata.id); - assertEquals(54, metadata.countryCode); - assertEquals("00", metadata.internationalPrefix); - assertEquals("0", metadata.nationalPrefix); - assertEquals("0(?:(11|343|3715)15)?", metadata.nationalPrefixForParsing); - assertEquals("9$1", metadata.nationalPrefixTransformRule); - assertEquals("$2 15 $3-$4", metadata.numberFormat[2].format); + assertEquals("AR", metadata.getId()); + assertEquals(54, metadata.getCountryCode()); + assertEquals("00", metadata.getInternationalPrefix()); + assertEquals("0", metadata.getNationalPrefix()); + assertEquals("0(?:(11|343|3715)15)?", metadata.getNationalPrefixForParsing()); + assertEquals("9$1", metadata.getNationalPrefixTransformRule()); + assertEquals("$2 15 $3-$4", metadata.getNumberFormat(2).getFormat()); assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.numberFormat[3].pattern); + metadata.getNumberFormat(3).getPattern()); assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.intlNumberFormat[3].pattern); - assertEquals("$1 $2 $3 $4", metadata.intlNumberFormat[3].format); + metadata.getIntlNumberFormat(3).getPattern()); + assertEquals("$1 $2 $3 $4", metadata.getIntlNumberFormat(3).getFormat()); } public void testGetInstanceLoadInternationalTollFreeMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForNonGeographicalRegion(800); - assertEquals("001", metadata.id); - assertEquals(800, metadata.countryCode); - assertEquals("$1 $2", metadata.numberFormat[0].format); - assertEquals("(\\d{4})(\\d{4})", metadata.numberFormat[0].pattern); - assertEquals("12345678", metadata.generalDesc.exampleNumber); - assertEquals("12345678", metadata.tollFree.exampleNumber); + assertEquals("001", metadata.getId()); + assertEquals(800, metadata.getCountryCode()); + assertEquals("$1 $2", metadata.getNumberFormat(0).getFormat()); + assertEquals("(\\d{4})(\\d{4})", metadata.getNumberFormat(0).getPattern()); + assertEquals("12345678", metadata.getGeneralDesc().getExampleNumber()); + assertEquals("12345678", metadata.getTollFree().getExampleNumber()); } public void testIsNumberGeographical() { @@ -210,6 +214,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertTrue(phoneUtil.isNumberGeographical(AU_NUMBER)); // Australian fixed line number. assertFalse(phoneUtil.isNumberGeographical(INTERNATIONAL_TOLL_FREE)); // International toll // free number. + // We test that mobile phone numbers in relevant regions are indeed considered geographical. + assertTrue(phoneUtil.isNumberGeographical(AR_MOBILE)); // Argentina, mobile phone number. + assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE1)); // Mexico, mobile phone number. + assertTrue(phoneUtil.isNumberGeographical(MX_MOBILE2)); // Mexico, another mobile phone number. } public void testIsLeadingZeroPossible() { @@ -231,12 +239,16 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // Google London, which has area code "20". assertEquals(2, phoneUtil.getLengthOfGeographicalAreaCode(GB_NUMBER)); - // A UK mobile phone, which has no area code. + // A mobile number in the UK does not have an area code (by default, mobile numbers do not, + // unless they have been added to our list of exceptions). assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(GB_MOBILE)); // Google Buenos Aires, which has area code "11". assertEquals(2, phoneUtil.getLengthOfGeographicalAreaCode(AR_NUMBER)); + // A mobile number in Argentina also has an area code. + assertEquals(3, phoneUtil.getLengthOfGeographicalAreaCode(AR_MOBILE)); + // Google Sydney, which has area code "2". assertEquals(1, phoneUtil.getLengthOfGeographicalAreaCode(AU_NUMBER)); @@ -251,6 +263,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // An international toll free number, which has no area code. assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(INTERNATIONAL_TOLL_FREE)); + + // A mobile number from China is geographical, but does not have an area code. + PhoneNumber cnMobile = new PhoneNumber().setCountryCode(86).setNationalNumber(18912341234L); + assertEquals(0, phoneUtil.getLengthOfGeographicalAreaCode(cnMobile)); } public void testGetLengthOfNationalDestinationCode() { @@ -287,6 +303,11 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // An international toll free number, which has NDC "1234". assertEquals(4, phoneUtil.getLengthOfNationalDestinationCode(INTERNATIONAL_TOLL_FREE)); + + // A mobile number from China is geographical, but does not have an area code: however it still + // can be considered to have a national destination code. + PhoneNumber cnMobile = new PhoneNumber().setCountryCode(86).setNationalNumber(18912341234L); + assertEquals(3, phoneUtil.getLengthOfNationalDestinationCode(cnMobile)); } public void testGetCountryMobileToken() { @@ -330,7 +351,17 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { PhoneNumberUtil.PhoneNumberType.MOBILE)); // RegionCode 001 is reserved for supporting non-geographical country calling code. We don't // support getting an example number for it with this method. - assertEquals(null, phoneUtil.getExampleNumber(RegionCode.UN001)); + assertNull(phoneUtil.getExampleNumber(RegionCode.UN001)); + } + + public void testGetInvalidExampleNumber() { + // RegionCode 001 is reserved for supporting non-geographical country calling codes. We don't + // support getting an invalid example number for it with getInvalidExampleNumber. + assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.UN001)); + assertNull(phoneUtil.getInvalidExampleNumber(RegionCode.CS)); + PhoneNumber usInvalidNumber = phoneUtil.getInvalidExampleNumber(RegionCode.US); + assertEquals(1, usInvalidNumber.getCountryCode()); + assertFalse(usInvalidNumber.getNationalNumber() == 0); } public void testGetExampleNumberForNonGeoEntity() { @@ -338,6 +369,13 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(UNIVERSAL_PREMIUM_RATE, phoneUtil.getExampleNumberForNonGeoEntity(979)); } + public void testGetExampleNumberWithoutRegion() { + // In our test metadata we don't cover all types: in our real metadata, we do. + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.FIXED_LINE)); + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.MOBILE)); + assertNotNull(phoneUtil.getExampleNumberForType(PhoneNumberUtil.PhoneNumberType.PREMIUM_RATE)); + } + public void testConvertAlphaCharactersInNumber() { String input = "1800-ABC-DEF"; // Alpha chars are converted to digits; everything else is left untouched. @@ -815,8 +853,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testFormatByPattern() { NumberFormat newNumFormat = new NumberFormat(); - newNumFormat.pattern = "(\\d{3})(\\d{3})(\\d{4})"; - newNumFormat.format = "($1) $2-$3"; + newNumFormat.setPattern("(\\d{3})(\\d{3})(\\d{4})"); + newNumFormat.setFormat("($1) $2-$3"); List<NumberFormat> newNumberFormats = new ArrayList<NumberFormat>(); newNumberFormats.add(newNumFormat); @@ -831,8 +869,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // $NP is set to '1' for the US. Here we check that for other NANPA countries the US rules are // followed. - newNumFormat.nationalPrefixFormattingRule = "$NP ($FG)"; - newNumFormat.format = "$1 $2-$3"; + newNumFormat.setNationalPrefixFormattingRule("$NP ($FG)"); + newNumFormat.setFormat("$1 $2-$3"); assertEquals("1 (242) 365-1234", phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -840,8 +878,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.pattern = "(\\d{2})(\\d{5})(\\d{3})"; - newNumFormat.format = "$1-$2 $3"; + newNumFormat.setPattern("(\\d{2})(\\d{5})(\\d{3})"); + newNumFormat.setFormat("$1-$2 $3"); newNumberFormats.set(0, newNumFormat); assertEquals("02-36618 300", @@ -851,20 +889,20 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(IT_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = "$NP$FG"; - newNumFormat.pattern = "(\\d{2})(\\d{4})(\\d{4})"; - newNumFormat.format = "$1 $2 $3"; + newNumFormat.setNationalPrefixFormattingRule("$NP$FG"); + newNumFormat.setPattern("(\\d{2})(\\d{4})(\\d{4})"); + newNumFormat.setFormat("$1 $2 $3"); newNumberFormats.set(0, newNumFormat); assertEquals("020 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = "($NP$FG)"; + newNumFormat.setNationalPrefixFormattingRule("($NP$FG)"); assertEquals("(020) 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.nationalPrefixFormattingRule = ""; + newNumFormat.setNationalPrefixFormattingRule(""); assertEquals("20 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -1437,9 +1475,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testMaybeStripNationalPrefix() { PhoneMetadata metadata = new PhoneMetadata(); - metadata.nationalPrefixForParsing = "34"; - metadata.generalDesc = new PhoneNumberDesc(); - metadata.generalDesc.nationalNumberPattern = "\\d{4,8}"; + metadata.setNationalPrefixForParsing("34"); + metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}")); StringBuilder numberToStrip = new StringBuilder("34356778"); String strippedNumber = "356778"; assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1451,20 +1488,20 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("Should have had no change - no national prefix present.", strippedNumber, numberToStrip.toString()); // Some countries have no national prefix. Repeat test with none specified. - metadata.nationalPrefixForParsing = ""; + metadata.setNationalPrefixForParsing(""); assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); assertEquals("Should not strip anything with empty national prefix.", strippedNumber, numberToStrip.toString()); // If the resultant number doesn't match the national rule, it shouldn't be stripped. - metadata.nationalPrefixForParsing = "3"; + metadata.setNationalPrefixForParsing("3"); numberToStrip = new StringBuilder("3123"); strippedNumber = "3123"; assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); - assertEquals("Should have had no change - after stripping, it wouldn't have matched " + - "the national rule.", - strippedNumber, numberToStrip.toString()); + assertEquals("Should have had no change - after stripping, it wouldn't have matched " + + "the national rule.", + strippedNumber, numberToStrip.toString()); // Test extracting carrier selection code. - metadata.nationalPrefixForParsing = "0(81)?"; + metadata.setNationalPrefixForParsing("0(81)?"); numberToStrip = new StringBuilder("08122123456"); strippedNumber = "22123456"; StringBuilder carrierCode = new StringBuilder(); @@ -1474,9 +1511,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals("Should have had national prefix and carrier code stripped.", strippedNumber, numberToStrip.toString()); // If there was a transform rule, check it was applied. - metadata.nationalPrefixTransformRule = "5$15"; + metadata.setNationalPrefixTransformRule("5$15"); // Note that a capturing group is present here. - metadata.nationalPrefixForParsing = "0(\\d{2})"; + metadata.setNationalPrefixForParsing("0(\\d{2})"); numberToStrip = new StringBuilder("031123"); String transformedNumber = "5315123"; assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1651,11 +1688,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { try { String phoneNumber = "(1 610) 619 446"; StringBuilder numberToFill = new StringBuilder(); - assertEquals("Should not have extracted a country calling code - invalid number after " + - "extraction of uncertain country calling code.", - 0, - phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, false, - number)); + assertEquals("Should not have extracted a country calling code - invalid number after " + + "extraction of uncertain country calling code.", + 0, + phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, false, number)); assertFalse("Should not contain CountryCodeSource.", number.hasCountryCodeSource()); } catch (NumberParseException e) { fail("Should not have thrown an exception: " + e.toString()); @@ -1664,11 +1700,10 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { try { String phoneNumber = "(1 610) 619"; StringBuilder numberToFill = new StringBuilder(); - assertEquals("Should not have extracted a country calling code - too short number both " + - "before and after extraction of uncertain country calling code.", - 0, - phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true, - number)); + assertEquals("Should not have extracted a country calling code - too short number both " + + "before and after extraction of uncertain country calling code.", + 0, + phoneUtil.maybeExtractCountryCode(phoneNumber, metadata, numberToFill, true, number)); assertEquals("Did not figure out CountryCodeSource correctly", CountryCodeSource.FROM_DEFAULT_COUNTRY, number.getCountryCodeSource()); } catch (NumberParseException e) { @@ -1814,20 +1849,18 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // Using a soft hyphen U+00AD. assertEquals(US_NUMBER, phoneUtil.parse("1 (650) 253\u00AD-0000", RegionCode.US)); // The whole number, including punctuation, is here represented in full-width form. - assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + - "\u3000\uFF12\uFF15\uFF13\uFF0D\uFF10\uFF10\uFF10" + - "\uFF10", - RegionCode.SG)); + assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + + "\u3000\uFF12\uFF15\uFF13\uFF0D\uFF10\uFF10\uFF10\uFF10", + RegionCode.SG)); // Using U+30FC dash instead. - assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + - "\u3000\uFF12\uFF15\uFF13\u30FC\uFF10\uFF10\uFF10" + - "\uFF10", - RegionCode.SG)); + assertEquals(US_NUMBER, phoneUtil.parse("\uFF0B\uFF11\u3000\uFF08\uFF16\uFF15\uFF10\uFF09" + + "\u3000\uFF12\uFF15\uFF13\u30FC\uFF10\uFF10\uFF10\uFF10", + RegionCode.SG)); // Using a very strange decimal digit range (Mongolian digits). - assertEquals(US_NUMBER, phoneUtil.parse("\u1811 \u1816\u1815\u1810 " + - "\u1812\u1815\u1813 \u1810\u1810\u1810\u1810", - RegionCode.US)); + assertEquals(US_NUMBER, phoneUtil.parse("\u1811 \u1816\u1815\u1810 " + + "\u1812\u1815\u1813 \u1810\u1810\u1810\u1810", + RegionCode.US)); } public void testParseWithLeadingZero() throws Exception { diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java index edcb004c..70596787 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java @@ -329,7 +329,7 @@ public class ShortNumberInfoTest extends TestMetadataTestCase { assertEquals(ShortNumberInfo.ShortNumberCost.UNKNOWN_COST, shortInfo.getExpectedCostForRegion(parse("211", RegionCode.US), RegionCode.US)); assertFalse(shortInfo.isEmergencyNumber("211", RegionCode.CA)); - assertEquals(ShortNumberInfo.ShortNumberCost.UNKNOWN_COST, + assertEquals(ShortNumberInfo.ShortNumberCost.TOLL_FREE, shortInfo.getExpectedCostForRegion(parse("211", RegionCode.CA), RegionCode.CA)); } diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 Binary files differindex c8d5ffa4..cfaaeca9 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_800 diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 Binary files differindex 87e98359..92cb48ae 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_979 diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD Binary files differindex fd2844b8..42e2c857 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AD diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE Binary files differindex de5efa3b..79aeb163 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO Binary files differindex 7865c2f5..3b33ecc0 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AO diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR Binary files differindex c9c1af82..e8eee835 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU Binary files differindex 734279b1..ef6e385b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_AU diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB Binary files differindex fc3a7156..76b000cd 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BB diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR Binary files differindex 8bf34a1d..22841767 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS Binary files differindex 443033c7..301810e1 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BS diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY Binary files differindex d89232d9..ac429201 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_BY diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA Binary files differindex 464bd029..3be2c449 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CA diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC Binary files differindex 2462f4c1..7547c46f 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CC diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN Binary files differindex b8329393..42970124 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CN diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX Binary files differindex 92a95820..7c76e172 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_CX diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE Binary files differindex e3797a48..e55eebfd 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_DE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR Binary files differindex ece939db..c15c8cda 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_FR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB Binary files differindex 9e8ecc45..59c48618 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GB diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG Binary files differindex 712f683d..b20aac7b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_GG diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU Binary files differindex 28fdec1d..43873a44 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_HU diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT Binary files differindex d3c00b2f..6f46a990 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_IT diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP Binary files differindex aa055b19..14180614 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_JP diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR Binary files differindex 49e83020..fc352035 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_KR diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX Binary files differindex cd4593a9..9151ddc1 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_MX diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ Binary files differindex 9a26ed1e..554b8002 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_NZ diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL Binary files differindex 7c5fc15b..da93e753 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_PL diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE Binary files differindex 144938ce..435ecc0b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_RE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE Binary files differindex 99fdf26f..7e9e68b7 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG Binary files differindex fa312851..1f13cb27 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SG diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US Binary files differindex a6c26c52..6ee41783 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_US diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT Binary files differindex 0852976e..aa7469b2 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_YT diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting b/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting Binary files differdeleted file mode 100644 index 82ae4a8f..00000000 --- a/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting +++ /dev/null @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.6</version> + <version>7.7.0</version> <packaging>pom</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> @@ -92,7 +92,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.12</version> <configuration> - <forkMode>never</forkMode> + <forkCount>0</forkCount> <includes> <include>**/*Test.java</include> </includes> diff --git a/release_notes.txt b/release_notes.txt index 2e89ec2e..25195c3c 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,174 @@ +Sep 19, 2016: libphonenumber-7.7.0 +Code changes: + - Removed the dependency on protobuf (protobuf-javanano) from the Java library, + resurrecting + java/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java + which was present until libphonenumber-7.1.1. + Does not affect the C++ or JavaScript libraries. + +Sep 07, 2016: libphonenumber-7.6.1 +Code changes: + - Phonemetadata.java has two more fields to represent possible lengths of phone + numbers. Changed BuildMetadataFromXml (and the resultant jar) to alter the way + that metadata about possible-lengths information is consumed when constructing + metadata to populate these. + Discussion list email: + https://groups.google.com/forum/#!topic/libphonenumber-discuss/75TOpTFVi08 +Metadata changes: + - Updated phone metadata for region code(s): + AG, AM, AX, BY, CD, FI, IN, KR, MA, NA, NL, PK, SY + - Updated short number metadata for region code(s): BR, GB, NL, NZ + - New geocoding data for country calling code(s): + 82 (pl, pt, ro, ru, sl, sr, uk, vi) + - Updated carrier data for country calling code(s): + 27 (en), 91 (en), 243 (en), 963 (en) + +Aug 24, 2016: libphonenumber-7.6.0 +Code changes: + - Refactored metadata loading and closed all streams after loading. + - Made isNumberGeographical public, and changed the geocoder to + use this when checking whether to give a detailed answer or country-level + only. +Build changes: + - Use protobuf-javanano 3.0.0-alpha-7 from Maven Central. +Metadata changes: + - Updated phone metadata for region code(s): EH, ET, JM, MA, SK, SN, SY, ZM + - Updated short number metadata for region code(s): ZA + - Updated geocoding data for country calling code(s): 212 (en) + - New carrier data for country calling code(s): + 86 (zh, zh_Hant), 852 (zh, zh_Hant), 963 (en) + - Updated carrier data for country calling code(s): + 86 (en), 212 (en), 251 (en), 421 (en) + - Deleted unsupported SingleFilePhoneNumberMetadataProto + +Aug 10, 2016: libphonenumber-7.5.2 +Metadata changes: + - Updated phone metadata for region code(s): CO, IN, ME + - Updated short number metadata for region code(s): IN + - New carrier data for country calling code(s): 382 (en) + - Updated carrier data for country calling code(s): 91 (en) + +Jul 27, 2016: libphonenumber-7.5.1 +Metadata changes: + - Updated alternate formatting data for country calling code(s): 595 + - Updated phone metadata for region code(s): BD, BG, CI, IN, PY, TJ + - Updated short number metadata for region code(s): IN + - New geocoding data for country calling code(s): + 82 (bg, ca, el, es, fi, hi, hu, iw, ja, tr) + - Updated geocoding data for country calling code(s): 44 (en) + - New carrier data for country calling code(s): 374 (ru) + - Updated carrier data for country calling code(s): + 91 (en), 374 (en), 992 (en) + +Jul 22, 2016: libphonenumber-7.5.0 +Code changes: + - Simplify concurrent metadata loading in MultiFileMetadataSourceImpl and + reduce points of contention. + +Jul 14, 2016: libphonenumber-7.4.5 +Metadata changes: + - Updated phone metadata for region code(s): CN, HN, IN, KW, LV, TC + - Updated short number metadata for region code(s): AE, BR, GB, ZA + - New geocoding data for country calling code(s): 93 (fa), 992 (en) + - Updated geocoding data for country calling code(s): + 91 (en), 98 (en, fa), 371 (en), 504 (en), 1 (en) + - Updated carrier data for country calling code(s): 91 (en) + +Jun 29, 2016: libphonenumber-7.4.4 +Metadata changes: + - Updated phone metadata for region code(s): AZ, BH, HN, IN, US + - Updated short number metadata for region code(s): BR, IN, SK + - New geocoding data for country calling code(s): 994 (en), + - Updated geocoding data for country calling code(s): 504 (en), 1 (en) + - Updated carrier data for country calling code(s): + 91 (en), 973 (en), 994 (en) + +Jun 15, 2016: libphonenumber-7.4.3 +Metadata changes: + - Updated phone metadata for region code(s): + HK, HN, IN, KN, KW, SK, SN, TH, TZ + - Updated short number metadata for region code(s): AR, NO + - New geocoding data for country calling code(s): 93 (en), 504 (en) + - New carrier data for country calling code(s): 93 (fa), 98 (fa) + - Updated carrier data for country calling code(s): + 66 (en), 91 (en), 255 (en), 421 (en) + +Jun 01, 2016: libphonenumber-7.4.2 +Code changes: + - Make C++ code forward compatible with an upcoming RE2 change. +Metadata changes: + - Updated phone metadata for region code(s): AE, BZ, GU, IN, KR + - Updated short number metadata for region code(s): BR + - New geocoding data for country calling code(s): 501 (en) + - Updated carrier data for country calling code(s): + 91 (en), 971 (en), 1671 (en) + +May 18, 2016: libphonenumber-7.4.1 +Metadata changes: + - Updated phone metadata for region code(s): FR, IL, KR + - Updated carrier data for country calling code(s): 972 (en) + +May 11, 2016: libphonenumber-7.4.0 +Maven changes: + - Repackage protobuf runtime dependency to prevent conflicts with clients' + protobuf dependencies. Backwards-compatible, so no changes needed for clients + who could use the previous release, but enables those with their own protobuf + dependencies to use this and future releases without workarounds. + +May 03, 2016: libphonenumber-7.3.2 +Metadata changes: + - Updated phone metadata for region code(s): + AU, BR, ET, IN, KH, ML, NO, SB, TJ, US + - Updated short number metadata for region code(s): CA, ML, US + - New geocoding data for country calling code(s): 223 (en) + - Updated geocoding data for country calling code(s): + 27 (en), 55 (en, pt), 1 (en) + - Updated carrier data for country calling code(s): + 61 (en), 91 (en), 223 (en), 251 (en), 677 (en), 992 (en) + +Apr 20, 2016: libphonenumber-7.3.1 +Metadata changes: + - Updated phone metadata for region code(s): DE, DJ, IL, IN, KH + - Updated short number metadata for region code(s): BR + - Updated carrier data for country calling code(s): + 91 (en), 855 (en), 972 (en) + +Apr 05, 2016: libphonenumber-7.3.0 +Code changes: + - Added java/pending_code_changes.txt for contributors to track code changes + between releases. + - Reduced minimum required version of cmake to 2.8. + - Added cmake installation instructions for Mac. + - Added getExampleNumberForType that doesn't take in a region, and + getInvalidExampleNumber + - Improvements to javadoc for parse method + - Update isNumberGeographical to return true for geographical mobile numbers. +Metadata changes: + - Updated phone metadata for region code(s): + BJ, BZ, CI, ET, GQ, KE, KW, ML, NO, OM, VN + - Updated short number metadata for region code(s): KE + - Updated geocoding data for country calling code(s): + 84 (en), 251 (en), 254 (en) + - Updated carrier data for country calling code(s): + 84 (en), 225 (en), 229 (en), 254 (en), 968 (en) + +Mar 21, 2016: libphonenumber-7.2.8 +Metadata changes: + - Updated phone metadata for region code(s): CL, CN, FO, KE, SE, SO + - Updated short number metadata for region code(s): FO + - Updated geocoding data for country calling code(s): 86 (en, zh) + - Updated carrier data for country calling code(s): + 86 (en), 252 (en), 254 (en) + +Mar 09, 2016: libphonenumber-7.2.7 +Code changes: + - Update nationalPrefixOptionalWhenFormatting documentation. +Metadata changes: + - Updated phone metadata for region code(s): CN, IN, MO, TK + - Updated short number metadata for region code(s): FR + - Updated carrier data for country calling code(s): 853 (en) + - Updated / refreshed time zone meta data. + Feb 25, 2016: libphonenumber-7.2.6 Metadata changes: - Updated phone metadata for region code(s): DJ, MA, NA, US |