diff options
| author | Neil Fuller <nfuller@google.com> | 2016-04-26 09:57:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-26 09:57:26 +0000 |
| commit | a2958e2a0fadcf63688029b7e6b0ccc5732222a2 (patch) | |
| tree | 9f78a87f1e2e181eeed37062143a96999b7c6ea0 | |
| parent | 186a1162e554ef7178d6bb8362cad97baeba0397 (diff) | |
| parent | 93399cc7a32833de9cb538ef7940eed61a23edca (diff) | |
| download | libphonenumber-nougat-mr1.5-release.tar.gz | |
DO NOT MERGE Revert to libphonenumber v7.0.11android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-release
am: 93399cc
* commit '93399cc7a32833de9cb538ef7940eed61a23edca':
DO NOT MERGE Revert to libphonenumber v7.0.11
Change-Id: If2060092ff94be43b369975fec30af6c546ad10c
625 files changed, 1370 insertions, 1720 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,14 +68,13 @@ 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) # Tests for unbundled use. -# vogar --timeout 0 \ - --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \ - com.google.i18n.phonenumbers +# vogar --timeout 0 --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber_intermediates/classes.jar \ +# --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \ +# com.google.i18n.phonenumbers include $(CLEAR_VARS) LOCAL_MODULE := libphonenumber-test LOCAL_MODULE_TAGS := optional @@ -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.android b/README.android index 9d37f381..e5925fae 100644 --- a/README.android +++ b/README.android @@ -1,4 +1,4 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 7.2.1 +Version: 7.0.11 License: Apache 2 Description: Google Phone Number Library. diff --git a/build-full.gradle b/build-full.gradle index bc879b92..901d6476 100644 --- a/build-full.gradle +++ b/build-full.gradle @@ -8,7 +8,3 @@ sourceSets.main { 'geocoder/src' ] } - -dependencies { - compile project(path: ':libprotobuf', configuration: 'nano') -} diff --git a/build.gradle b/build.gradle index df66d609..2c80e3ad 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,8 @@ sourceSets { 'com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java', 'com/google/i18n/phonenumbers/MetadataLoader.java', 'com/google/i18n/phonenumbers/MetadataManager.java', + 'com/google/i18n/phonenumbers/MetadataSource.java', + 'com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java', 'com/google/i18n/phonenumbers/NumberParseException.java', 'com/google/i18n/phonenumbers/Phonemetadata.java', 'com/google/i18n/phonenumbers/Phonenumber.java', @@ -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 865ec157..8081c90b 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.21</version> + <version>1.17</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.31</version> + <version>2.27</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en Binary files differindex ab861bc2..9d274719 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/245_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/245_en Binary files differindex 2b8b6d75..b3b542ba 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/245_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/245_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..0965127f 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/257_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en Binary files differindex 7fcfb3be..eeae5551 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/257_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en Binary files differindex dd0b5277..ddbc09b2 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_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..d3209034 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/45_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en Binary files differindex 8f4e0375..91594978 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/45_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en Binary files differindex 9d76b073..302e24d6 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en Binary files differindex 0ada6828..4be83419 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/678_en 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 differdeleted file mode 100644 index 1e5acc80..00000000 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en +++ /dev/null diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en Binary files differindex f9e1e700..7e2950af 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/880_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en Binary files differindex 6e77a4dd..7bcb94e2 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/964_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..23e1f756 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/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en Binary files differindex 62d54b5e..ba867b3b 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/975_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/975_en Binary files differindex fb112741..08284f6a 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/975_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/975_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en Binary files differindex 20a0576a..a4838c7c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en Binary files differindex a1ced623..6b5722df 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_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..1366ecb4 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 385690ff..318cee45 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.1</version> + <version>7.0.11</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> <properties> <gae.version>1.5.4</gae.version> @@ -43,17 +43,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.31</version> + <version>2.27</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.21</version> + <version>1.17</version> </dependency> </dependencies> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 4c2bb81b..65c8092d 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.31</version> + <version>2.27</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.31</version> + <version>2.27</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en Binary files differindex 99f54bc6..377f1634 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt Binary files differindex 63314399..40171fab 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/245_pt diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en Binary files differdeleted file mode 100644 index a7c1bf01..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_en Binary files differdeleted file mode 100644 index 16c40334..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/975_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/975_en Binary files differdeleted file mode 100644 index 48956e55..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/975_en +++ /dev/null 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 38e70e09..1f85b55b 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..0c201a63 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/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 1b38c31b..df16c660 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.31</version> + <version>2.27</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.2.1</version> + <version>7.0.11</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 d25500e4..e8f60f72 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.1</version> + <version>7.0.11</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.2.1</version> + <version>7.0.11</version> </parent> <build> @@ -28,43 +28,6 @@ <targetPath>com/google/i18n/phonenumbers/data</targetPath> </testResource> </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> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </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..456c8eda 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; @@ -118,7 +115,7 @@ public class AsYouTypeFormatter { private StringBuilder nationalNumber = new StringBuilder(); private List<NumberFormat> possibleFormats = new ArrayList<NumberFormat>(); - // A cache for frequently used country-specific regular expressions. + // A cache for frequently used country-specific regular expressions. private RegexCache regexCache = new RegexCache(64); /** @@ -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/MetadataManager.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java index 0d998c75..e6f44dee 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; @@ -71,35 +71,16 @@ class MetadataManager { } } - // 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); + alternateFormats.readExternal(in); + for (PhoneMetadata metadata : alternateFormats.getMetadataList()) { + callingCodeToAlternateFormatsMap.put(metadata.getCountryCode(), metadata); } } catch (IOException e) { LOGGER.log(Level.WARNING, e.toString()); @@ -126,10 +107,9 @@ class MetadataManager { 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) { + shortNumberMetadata.readExternal(in); + for (PhoneMetadata metadata : shortNumberMetadata.getMetadataList()) { regionCodeToShortNumberMetadataMap.put(regionCode, metadata); } } catch (IOException e) { diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java index 018ff3da..bedd570f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java @@ -16,10 +16,10 @@ 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. + * A source for phone metadata from resources. */ interface MetadataSource { /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java index 77907493..7c5bb8db 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -16,14 +16,15 @@ 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; @@ -54,14 +55,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>()); // The prefix of the metadata files from which region data is loaded. - private final String filePrefix; + private final String currentFilePrefix; // 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) { - this.filePrefix = filePrefix; + public MultiFileMetadataSourceImpl(String currentFilePrefix, MetadataLoader metadataLoader) { + this.currentFilePrefix = currentFilePrefix; this.metadataLoader = metadataLoader; } @@ -76,7 +77,7 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { 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); + loadMetadataFromFile(currentFilePrefix, regionCode, 0, metadataLoader); } } return regionToMetadataMap.get(regionCode); @@ -86,14 +87,16 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { synchronized (countryCodeToNonGeographicalMetadataMap) { if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode); + loadMetadataFromFile(currentFilePrefix, PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, + countryCallingCode, metadataLoader); } } return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); } // @VisibleForTesting - void loadMetadataFromFile(String regionCode, int countryCallingCode) { + void loadMetadataFromFile(String filePrefix, String regionCode, int countryCallingCode, + MetadataLoader metadataLoader) { boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); String fileName = filePrefix + "_" + (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); @@ -102,18 +105,19 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { logger.log(Level.SEVERE, "missing metadata: " + fileName); throw new IllegalStateException("missing metadata: " + fileName); } + ObjectInputStream in = null; try { - PhoneMetadataCollection metadataCollection = - loadMetadataAndCloseInput(new ObjectInputStream(source)); - PhoneMetadata[] metadataList = metadataCollection.metadata; - if (metadataList.length == 0) { + in = new ObjectInputStream(source); + PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in); + List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { logger.log(Level.SEVERE, "empty metadata: " + fileName); throw new IllegalStateException("empty metadata: " + fileName); } - if (metadataList.length > 1) { + if (metadataList.size() > 1) { logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); } - PhoneMetadata metadata = metadataList[0]; + PhoneMetadata metadata = metadataList.get(0); if (isNonGeoRegion) { countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); } else { @@ -127,20 +131,16 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { /** * 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. + * exceptions that occur while reading the stream are propagated (though exceptions that occur + * when the stream is closed will be 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)); + metadataCollection.readExternal(source); } catch (IOException e) { logger.log(Level.WARNING, "error reading input (ignored)", e); } finally { 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 2e91bcaa..1882217e 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; @@ -587,24 +587,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,7 +769,7 @@ 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; } @@ -1131,29 +1113,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 +1351,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 +1446,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 +1458,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 +1474,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 +1533,7 @@ public class PhoneNumberUtil { } String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); return formatRule != null; } @@ -1614,17 +1597,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 +1621,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); @@ -1655,12 +1639,10 @@ public class PhoneNumberUtil { } else { // Invalid region entered as country-calling-from (so no metadata was found for it) or the // region chosen has multiple international dialling prefixes. - if (!isValidRegionCode(regionCallingFrom)) { - logger.log(Level.WARNING, - "Trying to format number from invalid region " - + regionCallingFrom - + ". International formatting applied."); - } + logger.log(Level.WARNING, + "Trying to format number from invalid region " + + regionCallingFrom + + ". International formatting applied."); prefixNumberWithCountryCallingCode(countryCode, PhoneNumberFormat.INTERNATIONAL, formattedNumber); @@ -1723,27 +1705,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 +1747,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 +1765,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) { @@ -1836,8 +1818,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()); @@ -1856,10 +1838,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(), "ZZ"); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1882,8 +1864,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 +1876,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 +1918,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 +1985,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 +2071,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 +2138,7 @@ public class PhoneNumberUtil { if (metadata == null) { throw new IllegalArgumentException("Invalid region code: " + regionCode); } - return metadata.countryCode; + return metadata.getCountryCode(); } /** @@ -2182,7 +2164,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 +2198,7 @@ public class PhoneNumberUtil { if (mainMetadataForCallingCode == null) { return false; } - return mainMetadataForCallingCode.leadingZeroPossible; + return mainMetadataForCallingCode.isLeadingZeroPossible(); } /** @@ -2273,7 +2255,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 +2295,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 +2427,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 +2455,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 +2560,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 +2569,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. @@ -2880,7 +2862,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 +3136,7 @@ public class PhoneNumberUtil { return true; } String nationalSignificantNumber = getNationalSignificantNumber(number); - return !isNumberMatchingDesc(nationalSignificantNumber, metadata.noInternationalDialling); + return !isNumberMatchingDesc(nationalSignificantNumber, metadata.getNoInternationalDialling()); } /** @@ -3170,6 +3152,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..14904c5e --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java @@ -0,0 +1,1053 @@ +/* + * 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; + } + + // 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()); + } + if (other.hasExampleNumber()) { + setExampleNumber(other.getExampleNumber()); + } + return this; + } + + public boolean exactlySameAs(PhoneNumberDesc other) { + return nationalNumberPattern_.equals(other.nationalNumberPattern_) && + possibleNumberPattern_.equals(other.possibleNumberPattern_) && + 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_); + } + + 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()); + } + + 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..c0d01b4e 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; @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.regex.Pattern; /** * Methods for getting information about short phone numbers, such as short codes and emergency @@ -130,7 +131,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc); + return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc()); } /** @@ -151,7 +152,7 @@ public class ShortNumberInfo { return false; } return matcherApi.matchesPossibleNumber(getNationalSignificantNumber(number), - phoneMetadata.generalDesc); + phoneMetadata.getGeneralDesc()); } /** @@ -171,7 +172,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { continue; } - if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc)) { + if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) { return true; } } @@ -199,11 +200,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 +227,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 +293,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 +347,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 +430,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 +458,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 +482,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 +544,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 +573,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 deleted file mode 100644 index b89c234d..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ - -package com.google.i18n.phonenumbers; - -import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.nano.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; - -/** - * Implementation of {@link MetadataSource} that reads from a single resource file. - */ -final class SingleFileMetadataSourceImpl implements MetadataSource { - - private static final Logger logger = - Logger.getLogger(SingleFileMetadataSourceImpl.class.getName()); - - private static final String META_DATA_FILE_NAME = - "/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto"; - - // 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>()); - - // 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>()); - - // The metadata file from which region data is loaded. - private final String fileName; - - // The metadata loader used to inject alternative metadata sources. - private final MetadataLoader metadataLoader; - - // It is assumed that metadataLoader is not null. - public SingleFileMetadataSourceImpl(String fileName, MetadataLoader metadataLoader) { - this.fileName = fileName; - this.metadataLoader = metadataLoader; - } - - // It is assumed that metadataLoader is not null. - public SingleFileMetadataSourceImpl(MetadataLoader metadataLoader) { - this(META_DATA_FILE_NAME, 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(); - } - } - return regionToMetadataMap.get(regionCode); - } - - @Override - public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { - synchronized (countryCodeToNonGeographicalMetadataMap) { - if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - loadMetadataFromFile(); - } - } - return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); - } - - // @VisibleForTesting - void loadMetadataFromFile() { - InputStream source = metadataLoader.loadMetadata(fileName); - if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); - 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); - } - } - - /** - * 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); - } - } - 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..8f4dfc66 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..03c5f19e 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..683e159e 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..954e72b7 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..f6eaf0aa 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..d750a33e 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..a6e6f449 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..cc8cc35c 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..11a52b1e 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..5fb8fb58 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..8ad87f57 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..24d4d001 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..33d770f6 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..01af0344 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 79a8bb2d..6140377e 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 4efdfca4..61bd0228 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..54228be8 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..3c6b31bc 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..fe65c05e 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..a683ee7e 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 c1cd7dcb..5289438a 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 3529c9dd..143082d3 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 e638ddf4..5011c61a 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..a7b06e98 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..8de12c46 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..11ee8681 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..b3ed0bbf 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 f9ee806d..1cdd27ec 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 b33a101e..06bbe413 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..d7ff507d 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..40c84bd2 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..6e9cfe3d 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..4ccb0597 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..26aaa656 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..290ec580 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..94ba050e 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 e4adeaa6..0bef470f 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..cffdb8b6 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..021c2274 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..62f35c24 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 0d5f37ac..5b01fbb4 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 32e7b40e..b34a3656 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..e98b41a4 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 308c30f8..d0d2839d 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..03bd17fc 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..831e7213 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 c221c9a9..fa4308c3 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 07f53902..4d94ee04 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..b52fcca4 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..af516499 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..b3c50cdd 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..6449451e 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 e7861558..ecc5a52a 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 eb37bb19..c084b84c 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..8ef70535 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..b4d0437b 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..f09a6019 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..b86a88f7 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 f2739f32..141362d2 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..fedae526 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..0544c71f 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 434e501d..c72f5590 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 32b40bb5..4462c5ba 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 3a1bde24..49fc8544 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..297fbe4d 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..f7030e8c 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 3a2804da..a9d3ddf8 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..bd3a9d40 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 76cced16..459a0f23 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 5c0fcc41..8a4dace5 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..24d59b45 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..7d1eecca 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..8f1881a6 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..7511ce67 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..47acce07 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..0e1f43a8 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..1e8c2384 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 eb82d5a8..cbf1c4c8 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 54448916..44d04e05 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..fe9f621e 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..7343c284 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..714e4649 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..2fdbbfb8 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..3c17f9ae 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..ffaca37a 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..c409f124 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 9e63dc37..9849e748 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..62d6dacc 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..494984c7 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..eb89ae69 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..410c1b46 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..58279c9c 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..4a9150e6 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 2e8d03a4..bd678000 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..b975a1d4 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..ca0192bb 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..13942357 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..c9c43ddc 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..cb729cd2 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 dfa9d6ff..78a606de 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..006de137 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..a7b2ae13 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..a9d20fe7 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 db2d4832..b1bc5d10 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..10b08845 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..db1595ab 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..1241b496 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 55a869ba..b3dd4c31 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..9db8f6ef 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..9e24745e 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..216267c0 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 68b78c8f..07108525 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..a6caa036 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..5436f0ab 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..b66fcccb 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 30f58857..ece7eb7e 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..09988e64 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..15be96b2 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 d6a92518..c95a0e2d 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..24934243 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..19f058b0 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..9c28eb51 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..08b01753 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..0fbc7d13 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 bc414465..1be3aa87 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..ab70e5ca 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 e8954c79..e185e763 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..2713b6c3 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 aea135bb..200201ea 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..0ef6076f 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 83ca972a..eb8f9594 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..3ca2463a 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..2b900017 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..17e48d67 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 69218254..b36be6b6 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..2b67e52e 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..1d3d9d5e 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..71fb1763 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..7bec656b 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..d9c46a38 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..77c48b99 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..a0a53af2 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..2616120b 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 e5b1d248..e8fd6b80 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..36bd6598 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..7115840d 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..1fe1d4d6 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..7a8f9173 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..8599673b 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..1f20fa6b 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..95ebb144 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..b14c8bb6 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 9e363b33..8c14bed6 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..5be9de47 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..04bbe12c 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 b803a457..e0cbcf92 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..07858595 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..89c57276 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 c3623544..9cc97639 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..8375e5f6 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..657c97a5 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..1e578a8e 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..f4605620 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..7fbee872 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..80ffa2e5 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..65b2f1f1 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 dec787d8..8c6eb64d 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..6f3083ab 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..c693ec92 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..d4f230ad 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 86ca045a..862188eb 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..fd6a7c13 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..b9c52db0 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..71d187a3 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..262fafda 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..7f9f74f4 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..be8fe367 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..b980f3ff 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..88e9406f 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..24a7a770 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..2c9bbc5b 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..b1536f4c 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 b9e65545..ab342f6b 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..e27c62fe 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..d1d89044 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..f05266ba 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..df14f84a 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 8c253653..7ce02f20 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..821f17a3 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..1891fc52 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..3a01a256 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..298e973c 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..24c88869 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..8a1cb9ee 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..903dec15 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..06de92e5 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..c769356a 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..a6d7a148 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..48930210 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..39d1ebc2 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..63066982 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..e85a1981 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 d8eea8ba..626fb0ec 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..49bd8d0c 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..2c21c2ef 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 bef5d0ed..a2607df1 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..4ca42737 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 c13b25ff..19642c6b 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..4bf98c4a 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..4294cf93 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..9cfc22eb 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..84d0bd2c 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..7ea63edd 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..86e0518d 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..d36d1553 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..d1666974 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 2aec6f27..472486a2 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..7f03a188 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..d26ba68d 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..769f6f09 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 b5c46290..409fe598 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 7e03d087..c87d8b57 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..0e90dbc1 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..b2f44e25 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..02a73f61 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..e20bb98d 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..11fd5af0 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 3daf5fa1..065034d3 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 70d4b1b6..a6441e8d 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..29d6dee5 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..19d2338e 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 b9752d84..5347e820 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 c9771d03..ca2e8b86 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..de246f5e 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..2f4527a8 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..1995a300 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..12d16a91 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 fb4051c7..04521e58 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..e2f73886 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..1711a97c 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..fa28bc47 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 a72e5b00..551e326e 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..5e3db17e 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 a93f540f..28f0f02e 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 76c2d10b..8454793e 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..0fd97d47 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..36fd3d80 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 79fea91c..a0801df4 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..fb630c2e 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..24f3bd2a 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..f09bf95b 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..8598631a 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..0ba0feef 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..07816329 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..0fb368e1 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..fe534033 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..fb4894dd 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..6ea72a59 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..d1b952a8 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..d0cf967c 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..b8948291 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..40ae751f 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..2b7b5450 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..4b38d722 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..3a15688f 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 a1ba715d..946641be 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..8a14d4f8 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..933e7cca 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..a52bc978 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..797d5294 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..c1c073c1 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..048dea48 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..18b73445 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..39091613 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..2cb5251c 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 f5a4ab78..a454f3b8 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..4d857280 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..3ed554e6 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..153ec9ec 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..3e4866ec 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..155b7d52 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..37ee404a 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..7a01bf81 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..d3b876e3 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..5d2d656b 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..aa460ff6 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..b4046502 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..85fdfc0b 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..49bf8ab9 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..bbd87bf7 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..87c09c94 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..0a5f6751 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..60aacaf8 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..a2c4c037 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..91065b5c 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..821281fe 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..81f7dccc 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..3c396905 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..ecaa04f1 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..8df38012 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..98054ff0 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..0c4eff1b 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..3411d7f1 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..ea834cb8 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..783da2e7 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..57187502 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..ce8b75d8 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 6af1615b..c5962d38 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 40389847..4a644f3c 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 3d1eab67..8fe45dd3 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..8825c8b2 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 25596378..7cdaea8f 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..1a3604dd 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..34432f16 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..2a1c8a7c 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..47142711 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 d864b0bf..6ca452dd 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..8638f07e 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..87c38a91 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..439d2304 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..e086ffa1 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..e0594080 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 60a01c38..4982038a 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..2f2665e4 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..349ebe6c 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..24fba7ce 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..f0901ac2 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 93e54254..b91acd62 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..958d8e99 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 317d0472..8be70a07 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..208a7a78 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..fb236a77 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..d35588db 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..ac284653 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..9a8a4721 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..c494df98 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..177d6fdb 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..c890061a 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..6e2b7c9a 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..d199bed2 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 8cc103d7..1f9b0b12 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..53c1c04f 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..97b9bef4 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..e2966942 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..0a64e1c7 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..6d67cb65 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..cd8a2108 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 e8f556a9..08316ca7 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..6eedab01 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 945f08ea..46498f6d 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 44c6273a..630d89bd 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 998b514e..5db571af 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..13567974 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..51af3cd3 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..323d45c5 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..5a711cbf 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..f2b7611d 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 9236e392..d9d473b7 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 3ac84c83..b4fb3215 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..918ae8ce 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..865b0ce8 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..e7afad28 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..a881213d 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..31013f9f 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..be9ba991 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..f92e2c38 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..58942690 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..282b9aff 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..11f927b7 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..25823d11 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 3fbdd5f6..2beffe37 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..a492b005 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..2c7fa884 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..19f3e541 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..fae89ce2 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..825a9ee1 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..a26db878 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..6817a85b 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..4c5e7124 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..8d7a29ac 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..3819b431 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 ccbb9ec5..8148ca74 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 f645a0b6..f099c4ba 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 44dc3efb..e6d922f2 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..f389f9c2 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..a00d409d 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..eae7953b 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..41b3e576 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..e9d5f1d0 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..e6ee4a2e 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..203b7250 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..a3e55bea 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..3702ec24 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..eb61dd4a 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..7016f326 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..097cbbb1 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..623e577d 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..2f4a6b6c 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..690367fb 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..8e8d9922 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..083f7fd4 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 da74fb9a..f8345497 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..a37fec1b 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..aeb03dd4 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..8efd2c57 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..c5fa87e8 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..5c25f4ae 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..fd9a38b2 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..24dbfc46 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..3a506877 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..04d35ff8 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..65ca9ae5 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..d6c02c30 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..27e56139 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 8f223384..01dcf65b 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..d1659275 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..f937cc8a 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..4b6a0e43 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..678a2827 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..70f10e15 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..76832fd9 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..2358ea75 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..819a123a 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..91a65ed2 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..7d51ac94 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..ef96a5a6 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..678f4875 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 5428db80..ae1b6201 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..ad1e7663 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..bfefb4b1 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 9e15be79..ea10c6ac 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..a9f82943 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..9bdea25c 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..9a704435 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..1be529fe 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 eebf1650..4cc39ab0 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..28af2446 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..d0a711bb 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..6319123b 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..dc227c70 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..4035fa33 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..be38ce85 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..27a91d47 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..d10dc143 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..18f18130 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..559091cb 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 10ec0c12..0722842b 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..72e937d8 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 867bd367..ab81e665 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..9a3e1398 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..f7c73f14 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..cb8ecc01 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..08103b28 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..16c24603 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..51d2a9aa 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..4c26fe4b 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..297cb68b 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..009ec93d 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..7e5eb9fa 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..818bc0ac 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..ff036a2f 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..e2d5c285 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..60bd59bd 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..954c0f80 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..1beee259 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..83d453f2 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..7277d419 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..735b30b0 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..c24e45d3 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..c68094eb 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 c02c4021..05f763fa 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..ae252940 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..44f79df0 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..9603cb81 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..78128a28 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..9b23ccdb 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..d0e5e72b 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..15f91a78 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..8c2d76b7 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..f91a7f52 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..721c0ef3 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..edea90f2 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..56cce8c0 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..d315c602 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..6f9df3b7 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..973769fc 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..eaee6b8c 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..e5066d43 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..cb112c99 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..f0afb76d 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..db15bda8 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..ab6a58ea 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 63d701c3..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..b276eb9c 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()); @@ -216,9 +216,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 +239,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..a1d30c57 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -16,29 +16,33 @@ package com.google.i18n.phonenumbers; -import junit.framework.TestCase; - /** * Unit tests for MultiFileMetadataSourceImpl.java. */ -public class MultiFileMetadataSourceImplTest extends TestCase { - public MultiFileMetadataSourceImplTest() {} +public class MultiFileMetadataSourceImplTest extends TestMetadataTestCase { + + private final MultiFileMetadataSourceImpl multiFileMetadataSource; + + public MultiFileMetadataSourceImplTest() { + multiFileMetadataSource = new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX, + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + } 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); + multiFileMetadataSource.loadMetadataFromFile( + "no/such/file", "XX", -1, PhoneNumberUtil.DEFAULT_METADATA_LOADER); fail("expected exception"); } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); + assertTrue("Unexpected error: " + e, e.toString().contains("no/such/file_XX")); } try { - multiFileMetadataSource.loadMetadataFromFile( - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123); + multiFileMetadataSource.loadMetadataFromFile("no/such/file", + PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123, + 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..725a5904 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,71 @@ 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("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); + metadata.getNumberFormat(5).getPattern()); + assertEquals("$1 $2 $3", metadata.getNumberFormat(5).getFormat()); 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.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() { @@ -815,8 +809,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 +825,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 +834,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 +845,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 +1431,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,12 +1444,12 @@ 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)); @@ -1464,7 +1457,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { "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 +1467,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)); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java deleted file mode 100644 index 5b7f1303..00000000 --- a/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ - -package com.google.i18n.phonenumbers; - -import junit.framework.TestCase; - -/** - * Unit tests for SingleFileMetadataSourceImpl.java. - */ -public class SingleFileMetadataSourceImplTest extends TestCase { - public SingleFileMetadataSourceImplTest() {} - - public void testMissingMetadataFileThrowsRuntimeException() { - SingleFileMetadataSourceImpl singleFileMetadataSource = new SingleFileMetadataSourceImpl( - "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 { - singleFileMetadataSource.loadMetadataFromFile(); - fail("expected exception"); - } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file")); - } - } -} diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java index ca9014d4..99def5ae 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; * @author Shaopeng Jia */ public class TestMetadataTestCase extends TestCase { - private static final String TEST_META_DATA_FILE_PREFIX = + protected static final String TEST_META_DATA_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting"; protected final PhoneNumberUtil phoneUtil; 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..03c5f19e 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..56897b27 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..ace04c19 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..bc2e8d8e 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..c306e037 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..7d7fb24d 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..44da9cfd 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..672f42b1 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..c0f70683 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..b9c6f228 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..706d64ed 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..a169c934 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..97fa27e9 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..9741b32e 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..334390d4 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..c6835b76 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..db0a6b39 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..cc39b9e2 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..32a4d0d0 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..d10ef035 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..fb81fe0c 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..698c404b 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..5c388435 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..ff509e76 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..fee7982c 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..52b0c5a0 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..7bb4228d 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..c9643cdc 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..b97c6812 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..6058300b 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..fa8356d7 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.1</version> + <version>7.0.11</version> <packaging>pom</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> diff --git a/release_notes.txt b/release_notes.txt index 6310d2c4..66b5a87a 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,37 +1,3 @@ -Nov 11, 2015: libphonenumber-7.2.1 -Metadata changes: None -Fix to 7.2.0 - -Nov 10, 2015: libphonenumber-7.2.0 -Metadata changes: - - Updated phone metadata for region code(s): - BI, BT, IL, MN, MO, NP, RU, SK, VG - - Updated short number metadata for region code(s): BT, DK - - New geocoding data for country calling code(s): 972 (en), 975 (en) - - New carrier data for country calling code(s): 853 (en) - - Updated carrier data for country calling code(s): - 45 (en), 257 (en), 421 (en), 964 (en), 972 (en), 975 (en), 976 (en) -- Updated / refreshed time zone meta data. - -Oct 29, 2015: libphonenumber-7.1.1 -Metadata changes: - - Updated phone metadata for region code(s): - AT, BB, BR, GW, ID, MD, OM, SO, TT - - Updated short number metadata for region code(s): BB, NO - - New geocoding data for country calling code(s): 968 (en) - - Updated geocoding data for country calling code(s): 245 (en, pt) - - Updated carrier data for country calling code(s): - 62 (en), 245 (en), 252 (en), 373 (en), 968 (en), 1246 (en) - -Oct 08, 2015: libphonenumber-7.1.0 -API changes: - - New MetadataSource implementation that reads from a single metadata file with - all regions' phone number metadata. -Metadata changes: - - Updated phone metadata for region code(s): BR, BS, HT, IR, KW, MC, PA, VU - - Updated carrier data for country calling code(s): - 98 (en), 678 (en), 880 (en) - Sep 16, 2015: libphonenumber-7.0.11 Metadata changes: - Updated phone metadata for region code(s): |