diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-12-07 15:54:05 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2015-12-11 07:43:01 +0000 |
| commit | 6b489f77ae70bea07f3a8fbd877368b4e0f3142c (patch) | |
| tree | 795d2abf37f433cd1ebcd759b81b1b2fc0bf4d54 | |
| parent | abeb971bf494d4d67b68dea4b83e737724682d1b (diff) | |
| download | libphonenumber-6b489f77ae70bea07f3a8fbd877368b4e0f3142c.tar.gz | |
Upgrade to version 7.2.1 (Second Attempt)
This introduces a runtime dependency on nano protobuf. The
classes are jarjared from com.google.protobuf.nano into
com.android.protobuf.nano and will be built as part of the
ext library built in frameworks/base/Android.mk.
Bug: 24793335
Change-Id: I7bd8a5d3988d21ea5bb0fdaaad09df298e53e16a
623 files changed, 1716 insertions, 1368 deletions
@@ -57,6 +57,7 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-libart +LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano include $(BUILD_STATIC_JAVA_LIBRARY) # For unbundled use, supports gingerbread and up. @@ -67,12 +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_JAVA_LIBRARIES := libprotobuf-java-nano include $(BUILD_STATIC_JAVA_LIBRARY) # Tests for unbundled use. -# 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 +# vogar --timeout 0 \ + --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 @@ -80,5 +82,5 @@ 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_JAVA_LIBRARIES := libphonenumber +LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber libprotobuf-java-nano include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/README.android b/README.android index e5925fae..9d37f381 100644 --- a/README.android +++ b/README.android @@ -1,4 +1,4 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 7.0.11 +Version: 7.2.1 License: Apache 2 Description: Google Phone Number Library. @@ -45,6 +45,21 @@ </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" /> @@ -73,6 +88,21 @@ </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 8081c90b..865ec157 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.17</version> + <version>1.21</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.27</version> + <version>2.31</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 9d274719..ab861bc2 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 b3b542ba..2b8b6d75 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 0965127f..ba7b00d1 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 eeae5551..7fcfb3be 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 ddbc09b2..dd0b5277 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 d3209034..75f4d40c 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 91594978..8f4e0375 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 302e24d6..9d76b073 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 4be83419..0ada6828 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 differnew file mode 100644 index 00000000..1e5acc80 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/853_en 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 7e2950af..f9e1e700 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 7bcb94e2..6e77a4dd 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 23e1f756..d5736073 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 ba867b3b..62d54b5e 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 08284f6a..fb112741 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 a4838c7c..20a0576a 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 6b5722df..a1ced623 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 1366ecb4..b7f95b56 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 318cee45..385690ff 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.0.11</version> + <version>7.2.1</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> <properties> <gae.version>1.5.4</gae.version> @@ -43,17 +43,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.27</version> + <version>2.31</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.17</version> + <version>1.21</version> </dependency> </dependencies> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 65c8092d..4c2bb81b 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.27</version> + <version>2.31</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.27</version> + <version>2.31</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 377f1634..99f54bc6 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 40171fab..63314399 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 differnew file mode 100644 index 00000000..a7c1bf01 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/968_en 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 differnew file mode 100644 index 00000000..16c40334 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/972_en 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 differnew file mode 100644 index 00000000..48956e55 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/975_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config Binary files differindex 1f85b55b..38e70e09 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 0c201a63..f8a5045c 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 df16c660..1b38c31b 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.27</version> + <version>2.31</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.11</version> + <version>7.2.1</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 differnew file mode 100644 index 00000000..669e6728 --- /dev/null +++ b/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar 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 new file mode 100644 index 00000000..a9f88e00 --- /dev/null +++ b/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom @@ -0,0 +1,9 @@ +<?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 new file mode 100644 index 00000000..fdb85172 --- /dev/null +++ b/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml @@ -0,0 +1,12 @@ +<?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 e8f60f72..d25500e4 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.0.11</version> + <version>7.2.1</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> </parent> <build> @@ -28,6 +28,43 @@ <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 456c8eda..6af473e6 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.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.nano.Phonemetadata.NumberFormat; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; import java.util.ArrayList; import java.util.Iterator; @@ -61,8 +61,11 @@ 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 = - new PhoneMetadata().setInternationalPrefix("NA"); + private static final PhoneMetadata EMPTY_METADATA; + static { + EMPTY_METADATA = new PhoneMetadata(); + EMPTY_METADATA.internationalPrefix = "NA"; + } private PhoneMetadata defaultMetadata; private PhoneMetadata currentMetadata; @@ -115,7 +118,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); /** @@ -151,7 +154,7 @@ public class AsYouTypeFormatter { Iterator<NumberFormat> it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat numberFormat = it.next(); - String pattern = numberFormat.getPattern(); + String pattern = numberFormat.pattern; if (currentFormattingPattern.equals(pattern)) { return false; } @@ -159,7 +162,7 @@ public class AsYouTypeFormatter { currentFormattingPattern = pattern; shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.getNationalPrefixFormattingRule()).find(); + numberFormat.nationalPrefixFormattingRule).find(); // With a new formatting template, the matched position using the old template needs to be // reset. lastMatchPosition = 0; @@ -173,17 +176,17 @@ public class AsYouTypeFormatter { } private void getAvailableFormats(String leadingDigits) { - List<NumberFormat> formatList = - (isCompleteNumber && currentMetadata.intlNumberFormatSize() > 0) - ? currentMetadata.intlNumberFormats() - : currentMetadata.numberFormats(); - boolean nationalPrefixIsUsedByCountry = currentMetadata.hasNationalPrefix(); - for (NumberFormat format : formatList) { + NumberFormat[] numberFormats = + (isCompleteNumber && currentMetadata.intlNumberFormat.length > 0) + ? currentMetadata.intlNumberFormat + : currentMetadata.numberFormat; + boolean nationalPrefixIsUsedByCountry = (!currentMetadata.nationalPrefix.equals("")); + for (NumberFormat format : numberFormats) { if (!nationalPrefixIsUsedByCountry || isCompleteNumber || - format.isNationalPrefixOptionalWhenFormatting() || + format.nationalPrefixOptionalWhenFormatting || PhoneNumberUtil.formattingRuleHasFirstGroupOnly( - format.getNationalPrefixFormattingRule())) { - if (isFormatEligible(format.getFormat())) { + format.nationalPrefixFormattingRule)) { + if (isFormatEligible(format.format)) { possibleFormats.add(format); } } @@ -200,14 +203,14 @@ public class AsYouTypeFormatter { Iterator<NumberFormat> it = possibleFormats.iterator(); while (it.hasNext()) { NumberFormat format = it.next(); - if (format.leadingDigitsPatternSize() == 0) { + if (format.leadingDigitsPattern.length == 0) { // Keep everything that isn't restricted by leading digits. continue; } int lastLeadingDigitsPattern = - Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPatternSize() - 1); + Math.min(indexOfLeadingDigitsPattern, format.leadingDigitsPattern.length - 1); Pattern leadingDigitsPattern = regexCache.getPatternForRegex( - format.getLeadingDigitsPattern(lastLeadingDigitsPattern)); + format.leadingDigitsPattern[lastLeadingDigitsPattern]); Matcher m = leadingDigitsPattern.matcher(leadingDigits); if (!m.lookingAt()) { it.remove(); @@ -216,7 +219,7 @@ public class AsYouTypeFormatter { } private boolean createFormattingTemplate(NumberFormat format) { - String numberPattern = format.getPattern(); + String numberPattern = format.pattern; // The formatter doesn't format numbers when numberPattern contains "|", e.g. // (20|3)\d{4}. In those cases we quickly return. @@ -230,7 +233,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.getFormat()); + String tempTemplate = getFormattingTemplate(numberPattern, format.format); if (tempTemplate.length() > 0) { formattingTemplate.append(tempTemplate); return true; @@ -428,12 +431,12 @@ public class AsYouTypeFormatter { */ String attemptToFormatAccruedDigits() { for (NumberFormat numberFormat : possibleFormats) { - Matcher m = regexCache.getPatternForRegex(numberFormat.getPattern()).matcher(nationalNumber); + Matcher m = regexCache.getPatternForRegex(numberFormat.pattern).matcher(nationalNumber); if (m.matches()) { shouldAddSpaceAfterNationalPrefix = NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( - numberFormat.getNationalPrefixFormattingRule()).find(); - String formattedNumber = m.replaceAll(numberFormat.getFormat()); + numberFormat.nationalPrefixFormattingRule).find(); + String formattedNumber = m.replaceAll(numberFormat.format); return appendNationalNumber(formattedNumber); } } @@ -526,7 +529,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.getCountryCode() == 1) && (nationalNumber.charAt(0) == '1') && + return (currentMetadata.countryCode == 1) && (nationalNumber.charAt(0) == '1') && (nationalNumber.charAt(1) != '0') && (nationalNumber.charAt(1) != '1'); } @@ -537,9 +540,9 @@ public class AsYouTypeFormatter { startOfNationalNumber = 1; prefixBeforeNationalNumber.append('1').append(SEPARATOR_BEFORE_NATIONAL_NUMBER); isCompleteNumber = true; - } else if (currentMetadata.hasNationalPrefixForParsing()) { + } else if (!currentMetadata.nationalPrefixForParsing.equals("")) { Pattern nationalPrefixForParsing = - regexCache.getPatternForRegex(currentMetadata.getNationalPrefixForParsing()); + regexCache.getPatternForRegex(currentMetadata.nationalPrefixForParsing); Matcher m = nationalPrefixForParsing.matcher(nationalNumber); // Since some national prefix patterns are entirely optional, check that a national prefix // could actually be extracted. @@ -567,7 +570,7 @@ public class AsYouTypeFormatter { private boolean attemptToExtractIdd() { Pattern internationalPrefix = regexCache.getPatternForRegex("\\" + PhoneNumberUtil.PLUS_SIGN + "|" + - currentMetadata.getInternationalPrefix()); + currentMetadata.internationalPrefix); 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 e6f44dee..0d998c75 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.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadataCollection; +import com.google.protobuf.nano.CodedInputByteBufferNano; +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,16 +71,35 @@ 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.readExternal(in); - for (PhoneMetadata metadata : alternateFormats.getMetadataList()) { - callingCodeToAlternateFormatsMap.put(metadata.getCountryCode(), metadata); + alternateFormats.mergeFrom(byteBuffer); + for (PhoneMetadata metadata : alternateFormats.metadata) { + callingCodeToAlternateFormatsMap.put(metadata.countryCode, metadata); } } catch (IOException e) { LOGGER.log(Level.WARNING, e.toString()); @@ -107,9 +126,10 @@ class MetadataManager { ObjectInputStream in = null; try { in = new ObjectInputStream(source); + CodedInputByteBufferNano byteBuffer = convertStreamToByteBuffer(in, BUFFER_SIZE); PhoneMetadataCollection shortNumberMetadata = new PhoneMetadataCollection(); - shortNumberMetadata.readExternal(in); - for (PhoneMetadata metadata : shortNumberMetadata.getMetadataList()) { + shortNumberMetadata.mergeFrom(byteBuffer); + for (PhoneMetadata metadata : shortNumberMetadata.metadata) { 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 bedd570f..018ff3da 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.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; /** - * A source for phone metadata from resources. + * A source for phone metadata for all regions. */ interface MetadataSource { /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java index 7c5bb8db..77907493 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -16,15 +16,14 @@ package com.google.i18n.phonenumbers; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; +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; @@ -55,14 +54,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 currentFilePrefix; + private final String filePrefix; // The metadata loader used to inject alternative metadata sources. private final MetadataLoader metadataLoader; // It is assumed that metadataLoader is not null. - public MultiFileMetadataSourceImpl(String currentFilePrefix, MetadataLoader metadataLoader) { - this.currentFilePrefix = currentFilePrefix; + public MultiFileMetadataSourceImpl(String filePrefix, MetadataLoader metadataLoader) { + this.filePrefix = filePrefix; this.metadataLoader = metadataLoader; } @@ -77,7 +76,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(currentFilePrefix, regionCode, 0, metadataLoader); + loadMetadataFromFile(regionCode, 0); } } return regionToMetadataMap.get(regionCode); @@ -87,16 +86,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { synchronized (countryCodeToNonGeographicalMetadataMap) { if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - loadMetadataFromFile(currentFilePrefix, PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, - countryCallingCode, metadataLoader); + loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode); } } return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); } // @VisibleForTesting - void loadMetadataFromFile(String filePrefix, String regionCode, int countryCallingCode, - MetadataLoader metadataLoader) { + void loadMetadataFromFile(String regionCode, int countryCallingCode) { boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); String fileName = filePrefix + "_" + (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); @@ -105,19 +102,18 @@ final class MultiFileMetadataSourceImpl implements MetadataSource { logger.log(Level.SEVERE, "missing metadata: " + fileName); throw new IllegalStateException("missing metadata: " + fileName); } - ObjectInputStream in = null; try { - in = new ObjectInputStream(source); - PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in); - List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); - if (metadataList.isEmpty()) { + PhoneMetadataCollection metadataCollection = + loadMetadataAndCloseInput(new ObjectInputStream(source)); + PhoneMetadata[] metadataList = metadataCollection.metadata; + if (metadataList.length == 0) { logger.log(Level.SEVERE, "empty metadata: " + fileName); throw new IllegalStateException("empty metadata: " + fileName); } - if (metadataList.size() > 1) { + if (metadataList.length > 1) { logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); } - PhoneMetadata metadata = metadataList.get(0); + PhoneMetadata metadata = metadataList[0]; if (isNonGeoRegion) { countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); } else { @@ -131,16 +127,20 @@ 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 the stream are propagated (though exceptions that occur - * when the stream is closed will be ignored). + * exceptions that occur while reading or closing the stream are ignored. * * @param source the non-null stream from which metadata is to be read. * @return the loaded metadata protocol buffer. */ private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { + // The size of the byte buffer used for deserializing the phone number metadata files for each + // region. + final int MULTI_FILE_BUFFER_SIZE = 16 * 1024; + PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); try { - metadataCollection.readExternal(source); + metadataCollection.mergeFrom( + MetadataManager.convertStreamToByteBuffer(source, MULTI_FILE_BUFFER_SIZE)); } 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 c74b21ab..a9d918f2 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.Phonemetadata.NumberFormat; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; 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 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.numberFormats()) { + for (NumberFormat alternateFormat : alternateFormats.numberFormat) { 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.numberFormats(), nationalNumber); + util.chooseFormattingPatternForNumber(metadata.numberFormat, 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.getNationalPrefixFormattingRule().length() > 0) { - if (formatRule.isNationalPrefixOptionalWhenFormatting()) { + if ((formatRule != null) && formatRule.nationalPrefixFormattingRule.length() > 0) { + if (formatRule.nationalPrefixOptionalWhenFormatting) { // 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.getNationalPrefixFormattingRule())) { + formatRule.nationalPrefixFormattingRule)) { // 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 1882217e..2e91bcaa 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,6 +587,24 @@ 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 @@ -769,7 +787,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.hasNationalPrefix() && !number.isItalianLeadingZero()) { + if (metadata.nationalPrefix.equals("") && !number.isItalianLeadingZero()) { return 0; } @@ -1113,29 +1131,29 @@ public class PhoneNumberUtil { StringBuilder formattedNumber = new StringBuilder(20); NumberFormat formattingPattern = - chooseFormattingPatternForNumber(userDefinedFormats, nationalSignificantNumber); + chooseFormattingPatternForNumber(userDefinedFormats.toArray( + new NumberFormat[userDefinedFormats.size()]), 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. - numFormatCopy.mergeFrom(formattingPattern); - String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); + NumberFormat numFormatCopy = copyNumberFormat(formattingPattern); + String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; if (nationalPrefixFormattingRule.length() > 0) { - String nationalPrefix = metadata.getNationalPrefix(); + String nationalPrefix = metadata.nationalPrefix; 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.setNationalPrefixFormattingRule(nationalPrefixFormattingRule); + numFormatCopy.nationalPrefixFormattingRule = nationalPrefixFormattingRule; } else { // We don't want to have a rule for how to format the national prefix if there isn't one. - numFormatCopy.clearNationalPrefixFormattingRule(); + numFormatCopy.nationalPrefixFormattingRule = ""; } } formattedNumber.append( @@ -1351,16 +1369,16 @@ public class PhoneNumberUtil { } // Metadata cannot be null because we checked 'isValidRegionCode()' above. PhoneMetadata metadataForRegionCallingFrom = getMetadataForRegion(regionCallingFrom); - String internationalPrefix = metadataForRegionCallingFrom.getInternationalPrefix(); + String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; // 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.hasPreferredInternationalPrefix()) { + } else if (!metadataForRegionCallingFrom.preferredInternationalPrefix.equals("")) { internationalPrefixForFormatting = - metadataForRegionCallingFrom.getPreferredInternationalPrefix(); + metadataForRegionCallingFrom.preferredInternationalPrefix; } String regionCode = getRegionCodeForCountryCode(countryCallingCode); @@ -1446,7 +1464,7 @@ public class PhoneNumberUtil { PhoneMetadata metadata = getMetadataForRegion(regionCode); String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormat, 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). @@ -1458,7 +1476,7 @@ public class PhoneNumberUtil { // return the national format. // TODO: Refactor the code below with the code in // isNationalPrefixPresentIfRequired. - String candidateNationalPrefixRule = formatRule.getNationalPrefixFormattingRule(); + String candidateNationalPrefixRule = formatRule.nationalPrefixFormattingRule; // We assume that the first-group symbol will never be _before_ the national prefix. int indexOfFirstGroup = candidateNationalPrefixRule.indexOf("$1"); if (indexOfFirstGroup <= 0) { @@ -1474,9 +1492,8 @@ public class PhoneNumberUtil { break; } // Otherwise, we need to remove the national prefix from our output. - NumberFormat numFormatCopy = new NumberFormat(); - numFormatCopy.mergeFrom(formatRule); - numFormatCopy.clearNationalPrefixFormattingRule(); + NumberFormat numFormatCopy = copyNumberFormat(formatRule); + numFormatCopy.nationalPrefixFormattingRule = ""; List<NumberFormat> numberFormats = new ArrayList<NumberFormat>(1); numberFormats.add(numFormatCopy); formattedNumber = formatByPattern(number, PhoneNumberFormat.NATIONAL, numberFormats); @@ -1533,7 +1550,7 @@ public class PhoneNumberUtil { } String nationalNumber = getNationalSignificantNumber(number); NumberFormat formatRule = - chooseFormattingPatternForNumber(metadata.numberFormats(), nationalNumber); + chooseFormattingPatternForNumber(metadata.numberFormat, nationalNumber); return formatRule != null; } @@ -1597,18 +1614,17 @@ public class PhoneNumberUtil { } else if (metadataForRegionCallingFrom != null && countryCode == getCountryCodeForValidRegion(regionCallingFrom)) { NumberFormat formattingPattern = - chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormats(), + chooseFormattingPatternForNumber(metadataForRegionCallingFrom.numberFormat, nationalNumber); if (formattingPattern == null) { // If no pattern above is matched, we format the original input. return rawInput; } - NumberFormat newFormat = new NumberFormat(); - newFormat.mergeFrom(formattingPattern); + NumberFormat newFormat = copyNumberFormat(formattingPattern); // The first group is the first group of digits that the user wrote together. - newFormat.setPattern("(\\d+)(.*)"); + newFormat.pattern = "(\\d+)(.*)"; // Here we just concatenate them back together after the national prefix has been fixed. - newFormat.setFormat("$1$2"); + newFormat.format = "$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 @@ -1621,11 +1637,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.getInternationalPrefix(); + String internationalPrefix = metadataForRegionCallingFrom.internationalPrefix; internationalPrefixForFormatting = UNIQUE_INTERNATIONAL_PREFIX.matcher(internationalPrefix).matches() ? internationalPrefix - : metadataForRegionCallingFrom.getPreferredInternationalPrefix(); + : metadataForRegionCallingFrom.preferredInternationalPrefix; } StringBuilder formattedNumber = new StringBuilder(rawInput); String regionCode = getRegionCodeForCountryCode(countryCode); @@ -1639,10 +1655,12 @@ 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. - logger.log(Level.WARNING, - "Trying to format number from invalid region " - + regionCallingFrom - + ". International formatting applied."); + if (!isValidRegionCode(regionCallingFrom)) { + logger.log(Level.WARNING, + "Trying to format number from invalid region " + + regionCallingFrom + + ". International formatting applied."); + } prefixNumberWithCountryCallingCode(countryCode, PhoneNumberFormat.INTERNATIONAL, formattedNumber); @@ -1705,27 +1723,27 @@ public class PhoneNumberUtil { PhoneMetadata metadata, PhoneNumberFormat numberFormat, String carrierCode) { - List<NumberFormat> intlNumberFormats = metadata.intlNumberFormats(); + NumberFormat[] intlNumberFormats = metadata.intlNumberFormat; // When the intlNumberFormats exists, we use that to format national number for the // INTERNATIONAL format instead of using the numberDesc.numberFormats. - List<NumberFormat> availableFormats = - (intlNumberFormats.size() == 0 || numberFormat == PhoneNumberFormat.NATIONAL) - ? metadata.numberFormats() - : metadata.intlNumberFormats(); + NumberFormat[] availableFormats = + (intlNumberFormats.length == 0 || numberFormat == PhoneNumberFormat.NATIONAL) + ? metadata.numberFormat + : metadata.intlNumberFormat; NumberFormat formattingPattern = chooseFormattingPatternForNumber(availableFormats, number); return (formattingPattern == null) ? number : formatNsnUsingPattern(number, formattingPattern, numberFormat, carrierCode); } - NumberFormat chooseFormattingPatternForNumber(List<NumberFormat> availableFormats, + NumberFormat chooseFormattingPatternForNumber(NumberFormat[] availableFormats, String nationalNumber) { for (NumberFormat numFormat : availableFormats) { - int size = numFormat.leadingDigitsPatternSize(); + int size = numFormat.leadingDigitsPattern.length; if (size == 0 || regexCache.getPatternForRegex( // We always use the last leading_digits_pattern, as it is the most detailed. - numFormat.getLeadingDigitsPattern(size - 1)).matcher(nationalNumber).lookingAt()) { - Matcher m = regexCache.getPatternForRegex(numFormat.getPattern()).matcher(nationalNumber); + numFormat.leadingDigitsPattern[size - 1]).matcher(nationalNumber).lookingAt()) { + Matcher m = regexCache.getPatternForRegex(numFormat.pattern).matcher(nationalNumber); if (m.matches()) { return numFormat; } @@ -1747,15 +1765,15 @@ public class PhoneNumberUtil { NumberFormat formattingPattern, PhoneNumberFormat numberFormat, String carrierCode) { - String numberFormatRule = formattingPattern.getFormat(); + String numberFormatRule = formattingPattern.format; Matcher m = - regexCache.getPatternForRegex(formattingPattern.getPattern()).matcher(nationalNumber); + regexCache.getPatternForRegex(formattingPattern.pattern).matcher(nationalNumber); String formattedNationalNumber = ""; if (numberFormat == PhoneNumberFormat.NATIONAL && carrierCode != null && carrierCode.length() > 0 && - formattingPattern.getDomesticCarrierCodeFormattingRule().length() > 0) { + formattingPattern.domesticCarrierCodeFormattingRule.length() > 0) { // Replace the $CC in the formatting rule with the desired carrier code. - String carrierCodeFormattingRule = formattingPattern.getDomesticCarrierCodeFormattingRule(); + String carrierCodeFormattingRule = formattingPattern.domesticCarrierCodeFormattingRule; carrierCodeFormattingRule = CC_PATTERN.matcher(carrierCodeFormattingRule).replaceFirst(carrierCode); // Now replace the $FG in the formatting rule with the first group and the carrier code @@ -1765,7 +1783,7 @@ public class PhoneNumberUtil { formattedNationalNumber = m.replaceAll(numberFormatRule); } else { // Use the national prefix formatting rule instead. - String nationalPrefixFormattingRule = formattingPattern.getNationalPrefixFormattingRule(); + String nationalPrefixFormattingRule = formattingPattern.nationalPrefixFormattingRule; if (numberFormat == PhoneNumberFormat.NATIONAL && nationalPrefixFormattingRule != null && nationalPrefixFormattingRule.length() > 0) { @@ -1818,8 +1836,8 @@ public class PhoneNumberUtil { } PhoneNumberDesc desc = getNumberDescByType(getMetadataForRegion(regionCode), type); try { - if (desc.hasExampleNumber()) { - return parse(desc.getExampleNumber(), regionCode); + if (!desc.exampleNumber.equals("")) { + return parse(desc.exampleNumber, regionCode); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1838,10 +1856,10 @@ public class PhoneNumberUtil { public PhoneNumber getExampleNumberForNonGeoEntity(int countryCallingCode) { PhoneMetadata metadata = getMetadataForNonGeographicalRegion(countryCallingCode); if (metadata != null) { - PhoneNumberDesc desc = metadata.getGeneralDesc(); + PhoneNumberDesc desc = metadata.generalDesc; try { - if (desc.hasExampleNumber()) { - return parse("+" + countryCallingCode + desc.getExampleNumber(), "ZZ"); + if (!desc.exampleNumber.equals("")) { + return parse("+" + countryCallingCode + desc.exampleNumber, "ZZ"); } } catch (NumberParseException e) { logger.log(Level.SEVERE, e.toString()); @@ -1864,8 +1882,8 @@ public class PhoneNumberUtil { if (numberFormat == PhoneNumberFormat.RFC3966) { formattedNumber.append(RFC3966_EXTN_PREFIX).append(number.getExtension()); } else { - if (metadata.hasPreferredExtnPrefix()) { - formattedNumber.append(metadata.getPreferredExtnPrefix()).append(number.getExtension()); + if (!metadata.preferredExtnPrefix.equals("")) { + formattedNumber.append(metadata.preferredExtnPrefix).append(number.getExtension()); } else { formattedNumber.append(DEFAULT_EXTN_PREFIX).append(number.getExtension()); } @@ -1876,28 +1894,28 @@ public class PhoneNumberUtil { PhoneNumberDesc getNumberDescByType(PhoneMetadata metadata, PhoneNumberType type) { switch (type) { case PREMIUM_RATE: - return metadata.getPremiumRate(); + return metadata.premiumRate; case TOLL_FREE: - return metadata.getTollFree(); + return metadata.tollFree; case MOBILE: - return metadata.getMobile(); + return metadata.mobile; case FIXED_LINE: case FIXED_LINE_OR_MOBILE: - return metadata.getFixedLine(); + return metadata.fixedLine; case SHARED_COST: - return metadata.getSharedCost(); + return metadata.sharedCost; case VOIP: - return metadata.getVoip(); + return metadata.voip; case PERSONAL_NUMBER: - return metadata.getPersonalNumber(); + return metadata.personalNumber; case PAGER: - return metadata.getPager(); + return metadata.pager; case UAN: - return metadata.getUan(); + return metadata.uan; case VOICEMAIL: - return metadata.getVoicemail(); + return metadata.voicemail; default: - return metadata.getGeneralDesc(); + return metadata.generalDesc; } } @@ -1918,48 +1936,48 @@ public class PhoneNumberUtil { } private PhoneNumberType getNumberTypeHelper(String nationalNumber, PhoneMetadata metadata) { - if (!isNumberMatchingDesc(nationalNumber, metadata.getGeneralDesc())) { + if (!isNumberMatchingDesc(nationalNumber, metadata.generalDesc)) { return PhoneNumberType.UNKNOWN; } - if (isNumberMatchingDesc(nationalNumber, metadata.getPremiumRate())) { + if (isNumberMatchingDesc(nationalNumber, metadata.premiumRate)) { return PhoneNumberType.PREMIUM_RATE; } - if (isNumberMatchingDesc(nationalNumber, metadata.getTollFree())) { + if (isNumberMatchingDesc(nationalNumber, metadata.tollFree)) { return PhoneNumberType.TOLL_FREE; } - if (isNumberMatchingDesc(nationalNumber, metadata.getSharedCost())) { + if (isNumberMatchingDesc(nationalNumber, metadata.sharedCost)) { return PhoneNumberType.SHARED_COST; } - if (isNumberMatchingDesc(nationalNumber, metadata.getVoip())) { + if (isNumberMatchingDesc(nationalNumber, metadata.voip)) { return PhoneNumberType.VOIP; } - if (isNumberMatchingDesc(nationalNumber, metadata.getPersonalNumber())) { + if (isNumberMatchingDesc(nationalNumber, metadata.personalNumber)) { return PhoneNumberType.PERSONAL_NUMBER; } - if (isNumberMatchingDesc(nationalNumber, metadata.getPager())) { + if (isNumberMatchingDesc(nationalNumber, metadata.pager)) { return PhoneNumberType.PAGER; } - if (isNumberMatchingDesc(nationalNumber, metadata.getUan())) { + if (isNumberMatchingDesc(nationalNumber, metadata.uan)) { return PhoneNumberType.UAN; } - if (isNumberMatchingDesc(nationalNumber, metadata.getVoicemail())) { + if (isNumberMatchingDesc(nationalNumber, metadata.voicemail)) { return PhoneNumberType.VOICEMAIL; } - boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.getFixedLine()); + boolean isFixedLine = isNumberMatchingDesc(nationalNumber, metadata.fixedLine); if (isFixedLine) { - if (metadata.isSameMobileAndFixedLinePattern()) { + if (metadata.sameMobileAndFixedLinePattern) { return PhoneNumberType.FIXED_LINE_OR_MOBILE; - } else if (isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { + } else if (isNumberMatchingDesc(nationalNumber, metadata.mobile)) { 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.isSameMobileAndFixedLinePattern() && - isNumberMatchingDesc(nationalNumber, metadata.getMobile())) { + if (!metadata.sameMobileAndFixedLinePattern && + isNumberMatchingDesc(nationalNumber, metadata.mobile)) { return PhoneNumberType.MOBILE; } return PhoneNumberType.UNKNOWN; @@ -1985,14 +2003,14 @@ public class PhoneNumberUtil { boolean isNumberPossibleForDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher possibleNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.getPossibleNumberPattern()) + regexCache.getPatternForRegex(numberDesc.possibleNumberPattern) .matcher(nationalNumber); return possibleNumberPatternMatcher.matches(); } boolean isNumberMatchingDesc(String nationalNumber, PhoneNumberDesc numberDesc) { Matcher nationalNumberPatternMatcher = - regexCache.getPatternForRegex(numberDesc.getNationalNumberPattern()) + regexCache.getPatternForRegex(numberDesc.nationalNumberPattern) .matcher(nationalNumber); return isNumberPossibleForDesc(nationalNumber, numberDesc) && nationalNumberPatternMatcher.matches(); @@ -2071,8 +2089,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.hasLeadingDigits()) { - if (regexCache.getPatternForRegex(metadata.getLeadingDigits()) + if (!metadata.leadingDigits.equals("")) { + if (regexCache.getPatternForRegex(metadata.leadingDigits) .matcher(nationalNumber).lookingAt()) { return regionCode; } @@ -2138,7 +2156,7 @@ public class PhoneNumberUtil { if (metadata == null) { throw new IllegalArgumentException("Invalid region code: " + regionCode); } - return metadata.getCountryCode(); + return metadata.countryCode; } /** @@ -2164,7 +2182,7 @@ public class PhoneNumberUtil { + ") provided."); return null; } - String nationalPrefix = metadata.getNationalPrefix(); + String nationalPrefix = metadata.nationalPrefix; // If no national prefix was found, we return null. if (nationalPrefix.length() == 0) { return null; @@ -2198,7 +2216,7 @@ public class PhoneNumberUtil { if (mainMetadataForCallingCode == null) { return false; } - return mainMetadataForCallingCode.isLeadingZeroPossible(); + return mainMetadataForCallingCode.leadingZeroPossible; } /** @@ -2255,7 +2273,7 @@ public class PhoneNumberUtil { */ private boolean isShorterThanPossibleNormalNumber(PhoneMetadata regionMetadata, String number) { Pattern possibleNumberPattern = regexCache.getPatternForRegex( - regionMetadata.getGeneralDesc().getPossibleNumberPattern()); + regionMetadata.generalDesc.possibleNumberPattern); return testNumberLengthAgainstPattern(possibleNumberPattern, number) == ValidationResult.TOO_SHORT; } @@ -2295,7 +2313,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.getGeneralDesc().getPossibleNumberPattern()); + regexCache.getPatternForRegex(metadata.generalDesc.possibleNumberPattern); return testNumberLengthAgainstPattern(possibleNumberPattern, nationalNumber); } @@ -2427,7 +2445,7 @@ public class PhoneNumberUtil { // Set the default prefix to be something that will never match. String possibleCountryIddPrefix = "NonMatch"; if (defaultRegionMetadata != null) { - possibleCountryIddPrefix = defaultRegionMetadata.getInternationalPrefix(); + possibleCountryIddPrefix = defaultRegionMetadata.internationalPrefix; } CountryCodeSource countryCodeSource = @@ -2455,19 +2473,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.getCountryCode(); + int defaultCountryCode = defaultRegionMetadata.countryCode; String defaultCountryCodeString = String.valueOf(defaultCountryCode); String normalizedNumber = fullNumber.toString(); if (normalizedNumber.startsWith(defaultCountryCodeString)) { StringBuilder potentialNationalNumber = new StringBuilder(normalizedNumber.substring(defaultCountryCodeString.length())); - PhoneNumberDesc generalDesc = defaultRegionMetadata.getGeneralDesc(); + PhoneNumberDesc generalDesc = defaultRegionMetadata.generalDesc; Pattern validNumberPattern = - regexCache.getPatternForRegex(generalDesc.getNationalNumberPattern()); + regexCache.getPatternForRegex(generalDesc.nationalNumberPattern); maybeStripNationalPrefixAndCarrierCode( potentialNationalNumber, defaultRegionMetadata, null /* Don't need the carrier code */); Pattern possibleNumberPattern = - regexCache.getPatternForRegex(generalDesc.getPossibleNumberPattern()); + regexCache.getPatternForRegex(generalDesc.possibleNumberPattern); // 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. @@ -2560,7 +2578,7 @@ public class PhoneNumberUtil { boolean maybeStripNationalPrefixAndCarrierCode( StringBuilder number, PhoneMetadata metadata, StringBuilder carrierCode) { int numberLength = number.length(); - String possibleNationalPrefix = metadata.getNationalPrefixForParsing(); + String possibleNationalPrefix = metadata.nationalPrefixForParsing; if (numberLength == 0 || possibleNationalPrefix.length() == 0) { // Early return for numbers of zero length. return false; @@ -2569,14 +2587,14 @@ public class PhoneNumberUtil { Matcher prefixMatcher = regexCache.getPatternForRegex(possibleNationalPrefix).matcher(number); if (prefixMatcher.lookingAt()) { Pattern nationalNumberRule = - regexCache.getPatternForRegex(metadata.getGeneralDesc().getNationalNumberPattern()); + regexCache.getPatternForRegex(metadata.generalDesc.nationalNumberPattern); // 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.getNationalPrefixTransformRule(); + String transformRule = metadata.nationalPrefixTransformRule; if (transformRule == null || transformRule.length() == 0 || prefixMatcher.group(numOfGroups) == null) { // If the original number was viable, and the resultant number is not, we return. @@ -2862,7 +2880,7 @@ public class PhoneNumberUtil { normalize(nationalNumber); normalizedNationalNumber.append(nationalNumber); if (defaultRegion != null) { - countryCode = regionMetadata.getCountryCode(); + countryCode = regionMetadata.countryCode; phoneNumber.setCountryCode(countryCode); } else if (keepRawInput) { phoneNumber.clearCountryCodeSource(); @@ -3136,7 +3154,7 @@ public class PhoneNumberUtil { return true; } String nationalSignificantNumber = getNationalSignificantNumber(number); - return !isNumberMatchingDesc(nationalSignificantNumber, metadata.getNoInternationalDialling()); + return !isNumberMatchingDesc(nationalSignificantNumber, metadata.noInternationalDialling); } /** @@ -3152,6 +3170,6 @@ public class PhoneNumberUtil { logger.log(Level.WARNING, "Invalid or unknown region code provided: " + regionCode); return false; } - return metadata.isMobileNumberPortableRegion(); + return metadata.mobileNumberPortableRegion; } } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java b/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java deleted file mode 100644 index 14904c5e..00000000 --- a/libphonenumber/src/com/google/i18n/phonenumbers/Phonemetadata.java +++ /dev/null @@ -1,1053 +0,0 @@ -/* - * 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 c0d01b4e..fe5ca8f3 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.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.nano.Phonemetadata.PhoneNumberDesc; import java.util.ArrayList; import java.util.Arrays; @@ -31,7 +31,6 @@ 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 @@ -131,7 +130,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc()); + return matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc); } /** @@ -152,7 +151,7 @@ public class ShortNumberInfo { return false; } return matcherApi.matchesPossibleNumber(getNationalSignificantNumber(number), - phoneMetadata.getGeneralDesc()); + phoneMetadata.generalDesc); } /** @@ -172,7 +171,7 @@ public class ShortNumberInfo { if (phoneMetadata == null) { continue; } - if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) { + if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.generalDesc)) { return true; } } @@ -200,11 +199,11 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return false; } - PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); + PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); + PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -227,11 +226,11 @@ public class ShortNumberInfo { return false; } String shortNumber = getNationalSignificantNumber(number); - PhoneNumberDesc generalDesc = phoneMetadata.getGeneralDesc(); + PhoneNumberDesc generalDesc = phoneMetadata.generalDesc; if (!matchesPossibleNumberAndNationalNumber(shortNumber, generalDesc)) { return false; } - PhoneNumberDesc shortNumberDesc = phoneMetadata.getShortCode(); + PhoneNumberDesc shortNumberDesc = phoneMetadata.shortCode; return matchesPossibleNumberAndNationalNumber(shortNumber, shortNumberDesc); } @@ -293,13 +292,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -347,13 +346,13 @@ public class ShortNumberInfo { // The cost categories are tested in order of decreasing expense, since if for some reason the // patterns overlap the most expensive matching cost category should be returned. - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getPremiumRate())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.premiumRate)) { return ShortNumberCost.PREMIUM_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getStandardRate())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.standardRate)) { return ShortNumberCost.STANDARD_RATE; } - if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.getTollFree())) { + if (matchesPossibleNumberAndNationalNumber(shortNumber, phoneMetadata.tollFree)) { return ShortNumberCost.TOLL_FREE; } if (isEmergencyNumber(shortNumber, regionDialingFrom)) { @@ -430,7 +429,7 @@ public class ShortNumberInfo { for (String regionCode : regionCodes) { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); if (phoneMetadata != null - && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.getShortCode())) { + && matchesPossibleNumberAndNationalNumber(nationalNumber, phoneMetadata.shortCode)) { // The number is valid for this region. return regionCode; } @@ -458,9 +457,9 @@ public class ShortNumberInfo { if (phoneMetadata == null) { return ""; } - PhoneNumberDesc desc = phoneMetadata.getShortCode(); - if (desc.hasExampleNumber()) { - return desc.getExampleNumber(); + PhoneNumberDesc desc = phoneMetadata.shortCode; + if (!desc.exampleNumber.equals("")) { + return desc.exampleNumber; } return ""; } @@ -482,20 +481,20 @@ public class ShortNumberInfo { PhoneNumberDesc desc = null; switch (cost) { case TOLL_FREE: - desc = phoneMetadata.getTollFree(); + desc = phoneMetadata.tollFree; break; case STANDARD_RATE: - desc = phoneMetadata.getStandardRate(); + desc = phoneMetadata.standardRate; break; case PREMIUM_RATE: - desc = phoneMetadata.getPremiumRate(); + desc = phoneMetadata.premiumRate; break; default: // UNKNOWN_COST numbers are computed by the process of elimination from the other cost // categories. } - if (desc != null && desc.hasExampleNumber()) { - return desc.getExampleNumber(); + if (desc != null && !desc.exampleNumber.equals("")) { + return desc.exampleNumber; } return ""; } @@ -544,12 +543,12 @@ public class ShortNumberInfo { return false; } PhoneMetadata metadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); - if (metadata == null || !metadata.hasEmergency()) { + if (metadata == null || metadata.emergency == null) { return false; } String normalizedNumber = PhoneNumberUtil.normalizeDigitsOnly(number); - PhoneNumberDesc emergencyDesc = metadata.getEmergency(); + PhoneNumberDesc emergencyDesc = metadata.emergency; boolean allowPrefixMatchForRegion = allowPrefixMatch && !REGIONS_WHERE_EMERGENCY_NUMBERS_MUST_BE_EXACT.contains(regionCode); return matcherApi.matchesNationalNumber(normalizedNumber, emergencyDesc, @@ -573,7 +572,7 @@ public class ShortNumberInfo { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionCode); return (phoneMetadata != null) && (matchesPossibleNumberAndNationalNumber(nationalNumber, - phoneMetadata.getCarrierSpecific())); + phoneMetadata.carrierSpecific)); } /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java new file mode 100644 index 00000000..b89c234d --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/SingleFileMetadataSourceImpl.java @@ -0,0 +1,154 @@ +/* + * 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 7c4f9daa..7e32b2bb 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 5ab6d03f..a8394f75 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 4f6f50a5..cfd7b379 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 1999488e..82340deb 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 7c60d3d6..d0703f81 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 e857d20e..1ea3d71f 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 bd077e77..bffda86f 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 7ee05e92..79b39e11 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 dc7a5d13..83951fb5 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 6431d101..fb48aa62 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 9284fb16..0994e0db 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 a16f968b..3f3689ce 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 6932076f..b9d0f47d 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 ef963276..7bd530d8 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 37654d46..b98f0b39 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 c6d79133..a2f2fbe3 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 48addfeb..cab13d8a 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 4864eeb6..a5cdfdc3 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 54cc030a..aca98ea6 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 f8b78ffb..437160a4 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 1987a239..4be38166 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 c401bf93..fcd3a376 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 a2075952..490569e3 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 da951398..07bd92e0 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 8f4dfc66..a2563d38 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 7a0a3b81..2ff5a990 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 8763d3c0..3c041465 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 84f5a53c..0c434d18 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 bcf3abb9..3f59b7b5 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 52d0a37d..b28f198e 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 e7f5f11d..b9a02bc5 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 15209d24..f7996373 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 5d72f0be..74eba0df 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 efe9684b..59525337 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 5c772332..bae5eaa2 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 e231e9d5..8dc04dbd 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 94750712..531b6e2c 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 f63b8ecf..319d6211 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 69584350..931b3e54 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 a672784f..50afc445 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 31d4fe03..1cf408c7 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 01d2cb9f..6bdc92c4 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 81d6f13b..6e21214a 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 03c5f19e..c8d5ffa4 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 683e159e..d17c8d62 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 954e72b7..e8c082bd 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 f6eaf0aa..d58df564 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 d750a33e..ea9ef7ec 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 a6e6f449..ca49ff01 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 cc8cc35c..88b8a5ae 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 11a52b1e..0cd763b9 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 5fb8fb58..0929b3fe 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 8ad87f57..c1878bd8 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 24d4d001..bfac1112 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 33d770f6..3fed6695 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 01af0344..a34ad96a 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 6140377e..79a8bb2d 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 61bd0228..4efdfca4 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 54228be8..aa2ab6d8 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 3c6b31bc..38daaa1c 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 fe65c05e..133a93b2 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 a683ee7e..e8d3d9c8 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 5289438a..c1cd7dcb 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 143082d3..3529c9dd 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 5011c61a..e638ddf4 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 a7b06e98..bea4677d 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 8de12c46..3a0163b9 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 11ee8681..32fcc1ae 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 b3ed0bbf..9f7ced8a 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 1cdd27ec..f9ee806d 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 06bbe413..b33a101e 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 d7ff507d..9cab9756 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 40c84bd2..1265ae9c 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 6e9cfe3d..bda39900 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 4ccb0597..7700513c 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 26aaa656..1aa3e010 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 290ec580..ed13585d 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 94ba050e..25c83186 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 0bef470f..e4adeaa6 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 cffdb8b6..b8d90015 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 021c2274..a17a92b6 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 62f35c24..7825f44e 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 5b01fbb4..0d5f37ac 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 b34a3656..32e7b40e 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 e98b41a4..4790935c 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 d0d2839d..308c30f8 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 03bd17fc..63c20628 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 831e7213..f6ad5c1a 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 fa4308c3..c221c9a9 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 4d94ee04..07f53902 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 b52fcca4..cf0004f0 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 af516499..456b2a34 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 b3c50cdd..f1cb4eb7 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 6449451e..144c6ebe 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 ecc5a52a..e7861558 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 c084b84c..eb37bb19 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 8ef70535..21f89d88 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 b4d0437b..8d458be2 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 f09a6019..6c3815b7 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 b86a88f7..eba5a7bd 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 141362d2..f2739f32 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 fedae526..38836643 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 0544c71f..bea6d98a 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 c72f5590..434e501d 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 4462c5ba..32b40bb5 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 49fc8544..3a1bde24 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 297fbe4d..4003d75a 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 f7030e8c..fbaad08d 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 a9d3ddf8..3a2804da 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 bd3a9d40..0f0a954c 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 459a0f23..76cced16 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 8a4dace5..5c0fcc41 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 24d59b45..93eb0325 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 7d1eecca..9beb7d23 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 8f1881a6..45c53c65 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 7511ce67..f98dde25 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 47acce07..54840122 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 0e1f43a8..b9f7028c 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 1e8c2384..f31856ef 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 cbf1c4c8..eb82d5a8 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 44d04e05..54448916 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 fe9f621e..17da1054 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 7343c284..0b8ff8f1 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 714e4649..ec4f6344 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 2fdbbfb8..2a3c8a42 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 3c17f9ae..c27b0079 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 ffaca37a..8513d528 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 c409f124..d31f4808 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 9849e748..9e63dc37 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 62d6dacc..27548408 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 494984c7..76ea09d7 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 eb89ae69..17aa02e3 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 410c1b46..6f2a0887 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 58279c9c..3fef3017 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 4a9150e6..b9c885aa 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 bd678000..2e8d03a4 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 b975a1d4..357c2f02 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 ca0192bb..8799e47f 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 13942357..bed4f181 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 c9c43ddc..010b08f0 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 cb729cd2..0e66b7fa 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 78a606de..dfa9d6ff 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 006de137..737b6ebd 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 a7b2ae13..6efcfab6 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 a9d20fe7..aa348cb1 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 b1bc5d10..db2d4832 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 10b08845..8aab20bb 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 db1595ab..c8d1d5fa 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 1241b496..ae834a8a 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 b3dd4c31..55a869ba 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 9db8f6ef..09746144 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 9e24745e..fa66a439 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 216267c0..d03d54b9 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 07108525..68b78c8f 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 a6caa036..7a0aff30 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 5436f0ab..e0ce0c2b 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 b66fcccb..1f4aa7c2 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 ece7eb7e..30f58857 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 09988e64..d40afaea 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 15be96b2..8252564c 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 c95a0e2d..d6a92518 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 24934243..a06b3de7 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 19f058b0..3018755c 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 9c28eb51..3f090b0f 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 08b01753..90c99e5d 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 0fbc7d13..d613ba53 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 1be3aa87..bc414465 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 ab70e5ca..f77db732 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 e185e763..e8954c79 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 2713b6c3..ed9ca6d6 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 200201ea..aea135bb 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 0ef6076f..11e2f67c 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 eb8f9594..83ca972a 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 3ca2463a..d27d765f 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 2b900017..77b03c30 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 17e48d67..e581024e 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 b36be6b6..69218254 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 2b67e52e..de0a7f32 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 1d3d9d5e..5229b08c 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 71fb1763..e74f064f 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 7bec656b..51e44360 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 d9c46a38..293e570e 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 77c48b99..1a6159a5 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 a0a53af2..aff0d8ac 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 2616120b..87d5b7b6 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 e8fd6b80..e5b1d248 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 36bd6598..7b21de82 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 7115840d..0e181e2e 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 1fe1d4d6..c4752c7a 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 7a8f9173..85534b98 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 8599673b..7c1109ee 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 1f20fa6b..fe2f8eee 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 95ebb144..6d067e52 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 b14c8bb6..f3da8d51 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 8c14bed6..9e363b33 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 5be9de47..7fc3dc5c 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 04bbe12c..2c431d1c 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 e0cbcf92..b803a457 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 07858595..da0b5691 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 89c57276..6b3891e9 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 9cc97639..c3623544 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 8375e5f6..9f4ff69e 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 657c97a5..89674400 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 1e578a8e..1864b4a0 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 f4605620..e10d74a4 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 7fbee872..267bd729 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 80ffa2e5..3c3a9133 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 65b2f1f1..ba7d7622 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 8c6eb64d..dec787d8 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 6f3083ab..b4a00fc0 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 c693ec92..ca1b8809 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 d4f230ad..2b8d8ca1 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 862188eb..86ca045a 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 fd6a7c13..a346663a 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 b9c52db0..e74d23ec 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 71d187a3..643ca914 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 262fafda..fa21ba0d 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 7f9f74f4..ae7cff03 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 be8fe367..2e2af52a 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 b980f3ff..2280bf83 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 88e9406f..e2ab69d9 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 24a7a770..4ca001e5 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 2c9bbc5b..7130c273 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 b1536f4c..6d78c6af 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 ab342f6b..b9e65545 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 e27c62fe..c0cf3643 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 d1d89044..ebc0d913 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 f05266ba..ee40a831 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 df14f84a..3b54a741 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 7ce02f20..8c253653 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 821f17a3..3f011495 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 1891fc52..e0478c03 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 3a01a256..ed6d8297 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 298e973c..3b44fa5c 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 24c88869..3394f13d 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 8a1cb9ee..26dd0c45 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 903dec15..01c62caf 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 06de92e5..709b19be 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 c769356a..50a6e6c6 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 a6d7a148..2440e11a 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 48930210..f60c95d0 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 39d1ebc2..860a62f7 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 63066982..0b8c108f 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 e85a1981..a483c1ec 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 626fb0ec..d8eea8ba 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 49bd8d0c..1c0e6a2c 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 2c21c2ef..c8d6f823 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 a2607df1..bef5d0ed 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 4ca42737..2a006424 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 19642c6b..c13b25ff 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 4bf98c4a..f2f231b9 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 4294cf93..6c2df8f2 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 9cfc22eb..83fe3a16 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 84d0bd2c..bf98eef5 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 7ea63edd..9d3d88e5 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 86e0518d..d6ab3936 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 d36d1553..1736256b 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 d1666974..fbc8cd62 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 472486a2..2aec6f27 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 7f03a188..f61fd9d9 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 d26ba68d..3fccaea9 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 769f6f09..5359335c 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 409fe598..b5c46290 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 c87d8b57..7e03d087 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 0e90dbc1..cd6d88df 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 b2f44e25..415a87d3 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 02a73f61..43b8accb 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 e20bb98d..3b216e7e 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 11fd5af0..2afdf562 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 065034d3..3daf5fa1 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 a6441e8d..70d4b1b6 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 29d6dee5..fe9ea53f 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 19d2338e..55d9cdd1 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 5347e820..b9752d84 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 ca2e8b86..c9771d03 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 de246f5e..77446e35 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 2f4527a8..e520fee3 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 1995a300..af44a6ba 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 12d16a91..99a51557 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 04521e58..fb4051c7 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 e2f73886..34677205 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 1711a97c..38273b62 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 fa28bc47..e9484d11 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 551e326e..a72e5b00 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 5e3db17e..a1a3ad93 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 28f0f02e..a93f540f 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 8454793e..76c2d10b 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 0fd97d47..55c5d6c8 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 36fd3d80..818cca84 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 a0801df4..79fea91c 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 fb630c2e..73fdc760 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 24f3bd2a..88b4749a 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 f09bf95b..1dc3dd41 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 8598631a..a0ba8112 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 0ba0feef..e1d55445 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 07816329..0b35a04d 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 0fb368e1..74ffcdcc 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 fe534033..f24df335 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 fb4894dd..fbcfefc9 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 6ea72a59..3788b26d 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 d1b952a8..78ae869f 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 d0cf967c..e7e5bff1 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 b8948291..8ea4ce80 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 40ae751f..63522938 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 2b7b5450..310df7fa 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 4b38d722..8a9daf15 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 3a15688f..a27ffe7f 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 946641be..a1ba715d 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 8a14d4f8..d209247b 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 933e7cca..f3ffda49 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 a52bc978..565fcb51 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 797d5294..c3a7dc4e 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 c1c073c1..33520ea1 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 048dea48..269b75bf 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 18b73445..a1983cfb 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 39091613..3701ff68 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 2cb5251c..bd050b34 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 a454f3b8..f5a4ab78 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 4d857280..662b7ae2 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 3ed554e6..5b3dec4a 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 153ec9ec..3d5f8aaf 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 3e4866ec..2f404c38 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 155b7d52..b373c206 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 37ee404a..02cabe07 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 7a01bf81..22e77330 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 d3b876e3..a29dd56c 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 5d2d656b..8072ac7e 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 aa460ff6..66388d79 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 b4046502..f290d2ed 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 85fdfc0b..97605039 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 49bf8ab9..8c7e33c8 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 bbd87bf7..4609c032 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 87c09c94..60321f54 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 0a5f6751..9f460e27 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 60aacaf8..cdc47655 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 a2c4c037..13be56cb 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 91065b5c..a87dfd0c 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 821281fe..fc732e0b 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 81f7dccc..0b01c4ac 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 3c396905..2a9df3f2 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 ecaa04f1..6ace01af 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 8df38012..e03b68f7 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 98054ff0..557fcdd5 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 0c4eff1b..890d0df9 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 3411d7f1..d31a3714 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 ea834cb8..e6f3a6ab 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 783da2e7..d751c2d6 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 57187502..638e4ea3 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 ce8b75d8..584ed683 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 c5962d38..6af1615b 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 4a644f3c..40389847 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 8fe45dd3..3d1eab67 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 8825c8b2..9570d9ae 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 7cdaea8f..25596378 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 1a3604dd..2937e9f9 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 34432f16..02548a8d 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 2a1c8a7c..fffe170b 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 47142711..dffb0c4e 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 6ca452dd..d864b0bf 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 8638f07e..16f946ae 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 87c38a91..157e3019 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 439d2304..bd31d1a7 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 e086ffa1..9e332872 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 e0594080..992d15f9 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 4982038a..60a01c38 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 2f2665e4..105990ea 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 349ebe6c..d06ee70a 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 24fba7ce..c02c6760 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 f0901ac2..1032654b 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 b91acd62..93e54254 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 958d8e99..253da099 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 8be70a07..317d0472 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 208a7a78..42f73e84 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 fb236a77..0f035481 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 d35588db..d064d4b7 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 ac284653..525a43ab 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 9a8a4721..b58fcf3d 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 c494df98..1ec43e29 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 177d6fdb..5d89ce58 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 c890061a..45580ca6 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 6e2b7c9a..d29e28c5 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 d199bed2..0495da14 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 1f9b0b12..8cc103d7 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 53c1c04f..ad158a95 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 97b9bef4..0f971920 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 e2966942..2cdaa3ce 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 0a64e1c7..727fd90c 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 6d67cb65..ae9d3375 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 cd8a2108..dcfa8e59 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 08316ca7..e8f556a9 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 6eedab01..f20c9567 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 46498f6d..945f08ea 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 630d89bd..44c6273a 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 5db571af..998b514e 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 13567974..cf44a7c7 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 51af3cd3..0f486650 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 323d45c5..5672dc75 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 5a711cbf..a2b3e7de 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 f2b7611d..8ac0ca5b 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 d9d473b7..9236e392 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 b4fb3215..3ac84c83 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 918ae8ce..f1e1f5ba 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 865b0ce8..f531f3f5 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 e7afad28..60606743 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 a881213d..0a41f2bd 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 31013f9f..67c23821 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 be9ba991..645409a9 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 f92e2c38..357e193f 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 58942690..ad6ff09d 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 282b9aff..f007b0b5 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 11f927b7..bed22feb 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 25823d11..e0108aa9 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 2beffe37..3fbdd5f6 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 a492b005..b8d7ba7b 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 2c7fa884..2021fd6c 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 19f3e541..fdd15244 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 fae89ce2..a0db8e73 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 825a9ee1..461f7853 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 a26db878..dccb2145 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 6817a85b..75cbf63c 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 4c5e7124..f7a3bf53 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 8d7a29ac..865909b2 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 3819b431..1402e1b3 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 8148ca74..ccbb9ec5 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 f099c4ba..f645a0b6 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 e6d922f2..44dc3efb 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 f389f9c2..da6addd4 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 a00d409d..b72a0cb9 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 eae7953b..40b9d7bb 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 41b3e576..54c4b90b 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 e9d5f1d0..7fd5a28b 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 e6ee4a2e..b1fa010c 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 203b7250..9fb191b3 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 a3e55bea..c0c09600 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 3702ec24..cf8e304e 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 eb61dd4a..21b14db7 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 7016f326..22ea7224 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 097cbbb1..5ab339b8 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 623e577d..d1528324 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 2f4a6b6c..a34c3f04 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 690367fb..f6ec8c75 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 8e8d9922..e2c2542b 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 083f7fd4..38fb6c94 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 f8345497..da74fb9a 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 a37fec1b..ab8083e6 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 aeb03dd4..95dc6e3a 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 8efd2c57..91bafccd 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 c5fa87e8..dc5de200 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 5c25f4ae..e49f8113 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 fd9a38b2..fbd9affe 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 24dbfc46..e86b9ceb 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 3a506877..2c538915 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 04d35ff8..d771aa15 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 65ca9ae5..469c0aa3 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 d6c02c30..4765e574 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 27e56139..0e644247 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 01dcf65b..8f223384 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 d1659275..82318904 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 f937cc8a..f4b2a097 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 4b6a0e43..5a471fd3 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 678a2827..e225d925 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 70f10e15..ab3f5254 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 76832fd9..01fb50d5 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 2358ea75..fbcf2983 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 819a123a..d52f09dd 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 91a65ed2..2bc0ee23 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 7d51ac94..db09b2bf 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 ef96a5a6..c89463ca 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 678f4875..f0aa8a42 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 ae1b6201..5428db80 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 ad1e7663..f4adb431 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 bfefb4b1..0b237f00 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 ea10c6ac..9e15be79 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 a9f82943..c6440cd8 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 9bdea25c..b5930495 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 9a704435..574a4f46 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 1be529fe..924f8388 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 4cc39ab0..eebf1650 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 28af2446..85048861 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 d0a711bb..71da7531 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 6319123b..1f02df86 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 dc227c70..1af3a30d 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 4035fa33..f067ce04 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 be38ce85..983acb84 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 27a91d47..193fe6b7 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 d10dc143..4dba0dae 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 18f18130..3b2ddf5b 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 559091cb..e7bf39ca 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 0722842b..10ec0c12 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 72e937d8..71d22bda 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 ab81e665..867bd367 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 9a3e1398..f4270f18 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 f7c73f14..9957c8fa 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 cb8ecc01..a5cd1c3a 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 08103b28..c5f6cdbd 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 16c24603..e7bae5d4 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 51d2a9aa..097b246b 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 4c26fe4b..4b1f16d9 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 297cb68b..afa6a860 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 009ec93d..b2118eb9 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 7e5eb9fa..fa0cba52 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 818bc0ac..3f9db425 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 ff036a2f..96aa8a11 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 e2d5c285..16ed6c70 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 60bd59bd..11b3296e 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 954c0f80..51a8727f 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 1beee259..1dabb417 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 83d453f2..ded3a7c1 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 7277d419..992b3718 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 735b30b0..5a36936e 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 c24e45d3..1bb44352 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 c68094eb..1c67e2b4 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 05f763fa..c02c4021 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 ae252940..846f0185 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 44f79df0..0c67e673 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 9603cb81..58a31df2 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 78128a28..b7b68399 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 9b23ccdb..5b5cd668 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 d0e5e72b..7dc561d5 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 15f91a78..febccc90 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 8c2d76b7..a170b283 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 f91a7f52..b5b54580 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 721c0ef3..e9a731ec 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 edea90f2..aac109ba 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 56cce8c0..5e6e6df8 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 d315c602..136a0772 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 6f9df3b7..a6ab9eea 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 973769fc..fc5bcb22 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 eaee6b8c..686c1893 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 e5066d43..dcdd8dfa 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 cb112c99..60a6a334 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 f0afb76d..2e639e00 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 db15bda8..f0e5edbd 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 ab6a58ea..77fcbd62 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 differnew file mode 100644 index 00000000..63d701c3 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProto diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java b/libphonenumber/src/com/google/i18n/phonenumbers/internal/MatcherApi.java index 38319cbb..ac201366 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.Phonemetadata.PhoneNumberDesc; +import com.google.i18n.phonenumbers.nano.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 125a1822..b1e7a23f 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.getNationalNumberPattern()).matcher(nationalNumber); + numberDesc.nationalNumberPattern).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.getPossibleNumberPattern()).matcher(nationalNumber); + numberDesc.possibleNumberPattern).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 new file mode 100644 index 00000000..abf4a67b --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/nano/Phonemetadata.java @@ -0,0 +1,1040 @@ +// 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 b276eb9c..1365ac3f 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).getNoInternationalDialling(); + phoneNumberUtil.getMetadataForRegion(regionCode).noInternationalDialling; try { - if (desc.hasExampleNumber()) { - exampleNumber = phoneNumberUtil.parse(desc.getExampleNumber(), regionCode); + if (!desc.exampleNumber.equals("")) { + exampleNumber = phoneNumberUtil.parse(desc.exampleNumber, 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).getEmergency(); - if (desc.hasExampleNumber()) { - String exampleNumber = desc.getExampleNumber(); + MetadataManager.getShortNumberMetadataForRegion(regionCode).emergency; + if (!desc.exampleNumber.equals("")) { + String exampleNumber = desc.exampleNumber; 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).getCarrierSpecific(); - if (desc.hasExampleNumber()) { - String exampleNumber = desc.getExampleNumber(); + MetadataManager.getShortNumberMetadataForRegion(regionCode).carrierSpecific; + if (!desc.exampleNumber.equals("")) { + String exampleNumber = desc.exampleNumber; 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 229d8f7d..7a4b5eca 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.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.nano.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.numberFormats().size() > 0); + assertTrue(germanyAlternateFormats.numberFormat.length > 0); } public void testShortNumberMetadataContainsData() throws Exception { // We should have some data for France. PhoneMetadata franceShortNumberMetadata = MetadataManager.getShortNumberMetadataForRegion("FR"); assertNotNull(franceShortNumberMetadata); - assertTrue(franceShortNumberMetadata.hasShortCode()); + assertTrue(franceShortNumberMetadata.shortCode != null); } 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 a1d30c57..c1c53191 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -16,33 +16,29 @@ package com.google.i18n.phonenumbers; +import junit.framework.TestCase; + /** * Unit tests for MultiFileMetadataSourceImpl.java. */ -public class MultiFileMetadataSourceImplTest extends TestMetadataTestCase { - - private final MultiFileMetadataSourceImpl multiFileMetadataSource; - - public MultiFileMetadataSourceImplTest() { - multiFileMetadataSource = new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX, - PhoneNumberUtil.DEFAULT_METADATA_LOADER); - } +public class MultiFileMetadataSourceImplTest extends TestCase { + public MultiFileMetadataSourceImplTest() {} 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( - "no/such/file", "XX", -1, PhoneNumberUtil.DEFAULT_METADATA_LOADER); + multiFileMetadataSource.loadMetadataFromFile("XX", -1); fail("expected exception"); } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.toString().contains("no/such/file_XX")); + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_XX")); } try { - multiFileMetadataSource.loadMetadataFromFile("no/such/file", - PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123, - PhoneNumberUtil.DEFAULT_METADATA_LOADER); + multiFileMetadataSource.loadMetadataFromFile( + PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123); 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 725a5904..4f6bcaf5 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,71 +132,77 @@ 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.getId()); - assertEquals(1, metadata.getCountryCode()); - assertEquals("011", metadata.getInternationalPrefix()); - assertTrue(metadata.hasNationalPrefix()); - assertEquals(2, metadata.numberFormatSize()); + assertEquals("US", metadata.id); + assertEquals(1, metadata.countryCode); + assertEquals("011", metadata.internationalPrefix); + assertTrue(!metadata.nationalPrefix.equals("")); + assertEquals(2, metadata.numberFormat.length); assertEquals("(\\d{3})(\\d{3})(\\d{4})", - metadata.getNumberFormat(1).getPattern()); - assertEquals("$1 $2 $3", metadata.getNumberFormat(1).getFormat()); + metadata.numberFormat[1].pattern); + assertEquals("$1 $2 $3", metadata.numberFormat[1].format); assertEquals("[13-689]\\d{9}|2[0-35-9]\\d{8}", - 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()); + 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); // No shared-cost data is available, so it should be initialised to "NA". - assertEquals("NA", metadata.getSharedCost().getNationalNumberPattern()); - assertEquals("NA", metadata.getSharedCost().getPossibleNumberPattern()); + assertEquals("NA", metadata.sharedCost.nationalNumberPattern); + assertEquals("NA", metadata.sharedCost.possibleNumberPattern); } public void testGetInstanceLoadDEMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.DE); - 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("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("(\\d{3})(\\d{3,4})(\\d{4})", - metadata.getNumberFormat(5).getPattern()); - assertEquals("$1 $2 $3", metadata.getNumberFormat(5).getFormat()); + metadata.numberFormat[5].pattern); + assertEquals("$1 $2 $3", metadata.numberFormat[5].format); assertEquals("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:[1-9]\\d|0[2-9]))\\d{1,8}", - metadata.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()); + 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); } public void testGetInstanceLoadARMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.AR); - 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("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("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.getNumberFormat(3).getPattern()); + metadata.numberFormat[3].pattern); assertEquals("(9)(\\d{4})(\\d{2})(\\d{4})", - metadata.getIntlNumberFormat(3).getPattern()); - assertEquals("$1 $2 $3 $4", metadata.getIntlNumberFormat(3).getFormat()); + metadata.intlNumberFormat[3].pattern); + assertEquals("$1 $2 $3 $4", metadata.intlNumberFormat[3].format); } public void testGetInstanceLoadInternationalTollFreeMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForNonGeographicalRegion(800); - 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()); + 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); } public void testIsNumberGeographical() { @@ -809,8 +815,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testFormatByPattern() { NumberFormat newNumFormat = new NumberFormat(); - newNumFormat.setPattern("(\\d{3})(\\d{3})(\\d{4})"); - newNumFormat.setFormat("($1) $2-$3"); + newNumFormat.pattern = "(\\d{3})(\\d{3})(\\d{4})"; + newNumFormat.format = "($1) $2-$3"; List<NumberFormat> newNumberFormats = new ArrayList<NumberFormat>(); newNumberFormats.add(newNumFormat); @@ -825,8 +831,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.setNationalPrefixFormattingRule("$NP ($FG)"); - newNumFormat.setFormat("$1 $2-$3"); + newNumFormat.nationalPrefixFormattingRule = "$NP ($FG)"; + newNumFormat.format = "$1 $2-$3"; assertEquals("1 (242) 365-1234", phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -834,8 +840,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(BS_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.setPattern("(\\d{2})(\\d{5})(\\d{3})"); - newNumFormat.setFormat("$1-$2 $3"); + newNumFormat.pattern = "(\\d{2})(\\d{5})(\\d{3})"; + newNumFormat.format = "$1-$2 $3"; newNumberFormats.set(0, newNumFormat); assertEquals("02-36618 300", @@ -845,20 +851,20 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.formatByPattern(IT_NUMBER, PhoneNumberFormat.INTERNATIONAL, newNumberFormats)); - newNumFormat.setNationalPrefixFormattingRule("$NP$FG"); - newNumFormat.setPattern("(\\d{2})(\\d{4})(\\d{4})"); - newNumFormat.setFormat("$1 $2 $3"); + newNumFormat.nationalPrefixFormattingRule = "$NP$FG"; + newNumFormat.pattern = "(\\d{2})(\\d{4})(\\d{4})"; + newNumFormat.format = "$1 $2 $3"; newNumberFormats.set(0, newNumFormat); assertEquals("020 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.setNationalPrefixFormattingRule("($NP$FG)"); + newNumFormat.nationalPrefixFormattingRule = "($NP$FG)"; assertEquals("(020) 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); - newNumFormat.setNationalPrefixFormattingRule(""); + newNumFormat.nationalPrefixFormattingRule = ""; assertEquals("20 7031 3000", phoneUtil.formatByPattern(GB_NUMBER, PhoneNumberFormat.NATIONAL, newNumberFormats)); @@ -1431,8 +1437,9 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testMaybeStripNationalPrefix() { PhoneMetadata metadata = new PhoneMetadata(); - metadata.setNationalPrefixForParsing("34"); - metadata.setGeneralDesc(new PhoneNumberDesc().setNationalNumberPattern("\\d{4,8}")); + metadata.nationalPrefixForParsing = "34"; + metadata.generalDesc = new PhoneNumberDesc(); + metadata.generalDesc.nationalNumberPattern = "\\d{4,8}"; StringBuilder numberToStrip = new StringBuilder("34356778"); String strippedNumber = "356778"; assertTrue(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1444,12 +1451,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.setNationalPrefixForParsing(""); + metadata.nationalPrefixForParsing = ""; 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.setNationalPrefixForParsing("3"); + metadata.nationalPrefixForParsing = "3"; numberToStrip = new StringBuilder("3123"); strippedNumber = "3123"; assertFalse(phoneUtil.maybeStripNationalPrefixAndCarrierCode(numberToStrip, metadata, null)); @@ -1457,7 +1464,7 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { "the national rule.", strippedNumber, numberToStrip.toString()); // Test extracting carrier selection code. - metadata.setNationalPrefixForParsing("0(81)?"); + metadata.nationalPrefixForParsing = "0(81)?"; numberToStrip = new StringBuilder("08122123456"); strippedNumber = "22123456"; StringBuilder carrierCode = new StringBuilder(); @@ -1467,9 +1474,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.setNationalPrefixTransformRule("5$15"); + metadata.nationalPrefixTransformRule = "5$15"; // Note that a capturing group is present here. - metadata.setNationalPrefixForParsing("0(\\d{2})"); + metadata.nationalPrefixForParsing = "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 new file mode 100644 index 00000000..5b7f1303 --- /dev/null +++ b/libphonenumber/test/com/google/i18n/phonenumbers/SingleFileMetadataSourceImplTest.java @@ -0,0 +1,40 @@ +/* + * 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 99def5ae..ca9014d4 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 { - protected static final String TEST_META_DATA_FILE_PREFIX = + private 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 03c5f19e..c8d5ffa4 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 56897b27..87e98359 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 ace04c19..fd2844b8 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 bc2e8d8e..de5efa3b 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 c306e037..7865c2f5 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 7d7fb24d..c9c1af82 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 44da9cfd..734279b1 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 672f42b1..fc3a7156 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 c0f70683..8bf34a1d 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 b9c6f228..443033c7 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 706d64ed..d89232d9 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 a169c934..464bd029 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 97fa27e9..2462f4c1 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 9741b32e..b8329393 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 334390d4..92a95820 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 c6835b76..e3797a48 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 db0a6b39..ece939db 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 cc39b9e2..9e8ecc45 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 32a4d0d0..712f683d 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 d10ef035..28fdec1d 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 fb81fe0c..d3c00b2f 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 698c404b..aa055b19 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 5c388435..49e83020 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 ff509e76..cd4593a9 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 fee7982c..9a26ed1e 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 52b0c5a0..7c5fc15b 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 7bb4228d..144938ce 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 c9643cdc..99fdf26f 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 b97c6812..fa312851 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 6058300b..a6c26c52 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 fa8356d7..0852976e 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 differnew file mode 100644 index 00000000..82ae4a8f --- /dev/null +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/SingleFilePhoneNumberMetadataProtoForTesting @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.11</version> + <version>7.2.1</version> <packaging>pom</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> diff --git a/release_notes.txt b/release_notes.txt index 66b5a87a..6310d2c4 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,37 @@ +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): |