diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-29 23:07:52 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-06-29 23:07:52 +0000 |
| commit | 927974216c76a755e1eb1a966b10f7f13de88752 (patch) | |
| tree | 9ea4b5e3ec3efe86ecb8eb61525eba7d3fe5a177 | |
| parent | d9079f0136be872f46bacb5e06b9560bf8c62bf1 (diff) | |
| parent | 84a3bf21a6d553bc21a740ffe56725003e859778 (diff) | |
| download | libphonenumber-android14-d1-s3-release.tar.gz | |
Snap for 10412612 from 84a3bf21a6d553bc21a740ffe56725003e859778 to udc-d1-releaseandroid-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release
Change-Id: I6722e793c3dc5802153d0a4a35084ead3121fa1c
296 files changed, 338 insertions, 68 deletions
diff --git a/README.android b/README.android index a4823bb5..8eceae52 100644 --- a/README.android +++ b/README.android @@ -1,5 +1,5 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 8.13.2 +Version: 8.13.14 License: Apache 2 Description: Google Phone Number Library. diff --git a/README.version b/README.version index af5a4c54..82a2a7a2 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,3 @@ URL: https://github.com/googlei18n/libphonenumber/ -Version: 8.13.2 +Version: 8.13.14 BugComponent: 20868 diff --git a/carrier/pom.xml b/carrier/pom.xml index bbcf06ca..e8470a15 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.186</version> + <version>1.198</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </parent> <build> @@ -30,6 +30,30 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <instructions> + <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host> + </instructions> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>default-jar</id> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> @@ -55,12 +79,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.196</version> + <version>2.208</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 1368ea03..da975ed2 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/1284_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en Binary files differindex fcb01ab7..25da9455 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1284_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en Binary files differindex dfa60c96..3b6437d0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/220_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en Binary files differindex fd9b201c..004fceb7 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/228_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en Binary files differindex bf2994f5..450e661a 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/229_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en Binary files differindex 18bebd89..439eee8c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en Binary files differindex 43c651d5..10bd54c8 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en Binary files differindex 74a2f86f..e094ee38 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en Binary files differindex 13f66097..95ab4e5c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en Binary files differindex 0e4a45c7..4bac6b5d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/236_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en Binary files differindex 96a7b5b2..0f146eaf 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/261_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en Binary files differindex 1f76f32a..1c48cd18 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en Binary files differindex 6df37525..9826eafa 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en Binary files differindex a6405376..348962a2 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en Binary files differindex 2e9b8910..b545f1fc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en Binary files differindex 45d58073..85e7daa8 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en Binary files differindex 45c218b5..936df6a7 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en Binary files differindex 1de891a3..26ed948f 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en Binary files differindex ee0b5050..1bbaffd9 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en Binary files differindex 9bcdc608..060ded67 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/383_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en Binary files differindex cd4d92d5..6942a401 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en Binary files differindex 461263c5..966b2be0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en Binary files differindex 3d93178c..b3640bd6 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en Binary files differindex d5820e5a..55461859 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en Binary files differindex 427db09c..fa243b54 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en Binary files differindex e764cc8a..d5b9e949 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_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 dbc8c524..9bfb7170 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/46_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en Binary files differindex 1af5a6cb..1b005b4d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en Binary files differindex 5a2cac7d..28c14b01 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en Binary files differindex b6f975a4..5531c4cc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en Binary files differindex 1c2a50a2..8b7f78e0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en Binary files differindex 056751d1..a8ff5f47 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en Binary files differindex a7021aa8..49564e94 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en Binary files differindex eec8044e..f3ffd051 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/62_en Binary files differindex 36733be3..b0d8533c 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/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en Binary files differindex 490a94fe..3d25bfbc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en Binary files differindex 355e346d..71cbc428 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/686_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en Binary files differindex f0f063cb..0e6cb572 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/692_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en Binary files differindex 95424ab2..a135d694 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/81_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en Binary files differindex 91655150..85a6ed46 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en Binary files differindex 1c3f9e3f..00d7f7c3 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en Binary files differindex a332eae9..dccf09ef 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en Binary files differindex 157af23f..5a3748ed 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/967_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en Binary files differindex 380bc731..6014060c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_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 7be52323..a5719fbf 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 cafaee21..1cbc035c 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/98_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa Binary files differindex cdacabfb..31a3b0ab 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en Binary files differindex c7243dbb..19fb42a5 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en Binary files differindex d551c65f..c3e41725 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/998_en diff --git a/demo/pom.xml b/demo/pom.xml index 4723727d..0e0214f7 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> <packaging>war</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </parent> <properties> @@ -68,17 +68,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.196</version> + <version>2.208</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.186</version> + <version>1.198</version> </dependency> </dependencies> @@ -102,6 +102,11 @@ <groupId>org.apache.maven.plugins</groupId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>3.3.1</version> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>3.3.3</version> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index 166d3e60..f0ef7f08 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.196</version> + <version>2.208</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </parent> <build> @@ -38,6 +38,30 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <instructions> + <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host> + </instructions> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>default-jar</id> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> @@ -63,12 +87,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.196</version> + <version>2.208</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1428_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1428_en Binary files differnew file mode 100644 index 00000000..faa1cff6 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1428_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1472_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1472_en Binary files differnew file mode 100644 index 00000000..7a465d62 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1472_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1557_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1557_en Binary files differnew file mode 100644 index 00000000..de3a8cd1 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1557_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en Binary files differindex f2b6c5ad..04919d16 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en Binary files differdeleted file mode 100644 index d8b8de7d..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_en +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr Binary files differdeleted file mode 100644 index eb983e1c..00000000 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/33_fr +++ /dev/null diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en Binary files differindex 8cad8daf..a236ca15 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en Binary files differindex e1006cd9..e1d17724 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en Binary files differindex 3fc7f68a..a1ee5c2e 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/57_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en Binary files differindex b5cd9779..08ab42db 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/61_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en Binary files differindex 32876c45..2c08ebf4 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/686_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en Binary files differindex 17db7e24..48ea7c2d 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh Binary files differindex 287e04eb..2ab9c681 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en Binary files differindex de3d3c6a..953ca978 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_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 af83ebc2..8522ceb3 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 26828e26..aaa202fc 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 bc67286f..0a673a5e 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.196</version> + <version>2.208</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -25,6 +25,31 @@ </testResources> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.2.0</version> + <configuration> + <instructions> + <Fragment-Host>com.googlecode.libphonenumber</Fragment-Host> + </instructions> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>default-jar</id> + <configuration> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> <executions> @@ -50,7 +75,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </dependency> </dependencies> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index c931942f..614f024c 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>8.13.2</version> + <version>8.13.14</version> <packaging>jar</packaging> <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> </parent> <build> @@ -35,6 +35,7 @@ <version>3.2.0</version> <configuration> <instructions> + <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI> <Export-Package>com.google.i18n.phonenumbers</Export-Package> </instructions> </configuration> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java b/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java index 9b084a8f..ef3dfa11 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/NumberParseException.java @@ -31,9 +31,10 @@ public class NumberParseException extends Exception { */ INVALID_COUNTRY_CODE, /** - * This generally indicates the string passed in had less than 3 digits in it. More - * specifically, the number failed to match the regular expression VALID_PHONE_NUMBER in - * PhoneNumberUtil.java. + * This indicates the string passed is not a valid number. Either the string had less than 3 + * digits in it or had an invalid phone-context parameter. More specifically, the number failed + * to match the regular expression VALID_PHONE_NUMBER, RFC3966_GLOBAL_NUMBER_DIGITS, or + * RFC3966_DOMAINNAME in PhoneNumberUtil.java. */ NOT_A_NUMBER, /** diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 200bea5a..1f49d674 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -306,6 +306,27 @@ public class PhoneNumberUtil { private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true); static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false); + // Regular expression of valid global-number-digits for the phone-context parameter, following the + // syntax defined in RFC3966. + private static final String RFC3966_VISUAL_SEPARATOR = "[\\-\\.\\(\\)]?"; + private static final String RFC3966_PHONE_DIGIT = + "(" + DIGITS + "|" + RFC3966_VISUAL_SEPARATOR + ")"; + private static final String RFC3966_GLOBAL_NUMBER_DIGITS = + "^\\" + PLUS_SIGN + RFC3966_PHONE_DIGIT + "*" + DIGITS + RFC3966_PHONE_DIGIT + "*$"; + static final Pattern RFC3966_GLOBAL_NUMBER_DIGITS_PATTERN = + Pattern.compile(RFC3966_GLOBAL_NUMBER_DIGITS); + + // Regular expression of valid domainname for the phone-context parameter, following the syntax + // defined in RFC3966. + private static final String ALPHANUM = VALID_ALPHA + DIGITS; + private static final String RFC3966_DOMAINLABEL = + "[" + ALPHANUM + "]+((\\-)*[" + ALPHANUM + "])*"; + private static final String RFC3966_TOPLABEL = + "[" + VALID_ALPHA + "]+((\\-)*[" + ALPHANUM + "])*"; + private static final String RFC3966_DOMAINNAME = + "^(" + RFC3966_DOMAINLABEL + "\\.)*" + RFC3966_TOPLABEL + "\\.?$"; + static final Pattern RFC3966_DOMAINNAME_PATTERN = Pattern.compile(RFC3966_DOMAINNAME); + /** * Helper method for constructing regular expressions for parsing. Creates an expression that * captures up to maxLength digits. @@ -3339,26 +3360,70 @@ public class PhoneNumberUtil { } /** + * Extracts the value of the phone-context parameter of numberToExtractFrom where the index of + * ";phone-context=" is the parameter indexOfPhoneContext, following the syntax defined in + * RFC3966. + * + * @return the extracted string (possibly empty), or null if no phone-context parameter is found. + */ + private String extractPhoneContext(String numberToExtractFrom, int indexOfPhoneContext) { + // If no phone-context parameter is present + if (indexOfPhoneContext == -1) { + return null; + } + + int phoneContextStart = indexOfPhoneContext + RFC3966_PHONE_CONTEXT.length(); + // If phone-context parameter is empty + if (phoneContextStart >= numberToExtractFrom.length()) { + return ""; + } + + int phoneContextEnd = numberToExtractFrom.indexOf(';', phoneContextStart); + // If phone-context is not the last parameter + if (phoneContextEnd != -1) { + return numberToExtractFrom.substring(phoneContextStart, phoneContextEnd); + } else { + return numberToExtractFrom.substring(phoneContextStart); + } + } + + /** + * Returns whether the value of phoneContext follows the syntax defined in RFC3966. + */ + private boolean isPhoneContextValid(String phoneContext) { + if (phoneContext == null) { + return true; + } + if (phoneContext.length() == 0) { + return false; + } + + // Does phone-context value match pattern of global-number-digits or domainname + return RFC3966_GLOBAL_NUMBER_DIGITS_PATTERN.matcher(phoneContext).matches() + || RFC3966_DOMAINNAME_PATTERN.matcher(phoneContext).matches(); + } + + /** * Converts numberToParse to a form that we can parse and write it to nationalNumber if it is * written in RFC3966; otherwise extract a possible number out of it and write to nationalNumber. */ - private void buildNationalNumberForParsing(String numberToParse, StringBuilder nationalNumber) { + private void buildNationalNumberForParsing(String numberToParse, StringBuilder nationalNumber) + throws NumberParseException { int indexOfPhoneContext = numberToParse.indexOf(RFC3966_PHONE_CONTEXT); - if (indexOfPhoneContext >= 0) { - int phoneContextStart = indexOfPhoneContext + RFC3966_PHONE_CONTEXT.length(); + + String phoneContext = extractPhoneContext(numberToParse, indexOfPhoneContext); + if (!isPhoneContextValid(phoneContext)) { + throw new NumberParseException(NumberParseException.ErrorType.NOT_A_NUMBER, + "The phone-context value is invalid."); + } + if (phoneContext != null) { // If the phone context contains a phone number prefix, we need to capture it, whereas domains // will be ignored. - if (phoneContextStart < (numberToParse.length() - 1) - && numberToParse.charAt(phoneContextStart) == PLUS_SIGN) { + if (phoneContext.charAt(0) == PLUS_SIGN) { // Additional parameters might follow the phone context. If so, we will remove them here - // because the parameters after phone context are not important for parsing the - // phone number. - int phoneContextEnd = numberToParse.indexOf(';', phoneContextStart); - if (phoneContextEnd > 0) { - nationalNumber.append(numberToParse.substring(phoneContextStart, phoneContextEnd)); - } else { - nationalNumber.append(numberToParse.substring(phoneContextStart)); - } + // because the parameters after phone context are not important for parsing the phone + // number. + nationalNumber.append(phoneContext); } // Now append everything between the "tel:" prefix and the phone-context. This should include @@ -3366,8 +3431,8 @@ public class PhoneNumberUtil { // handle the case when "tel:" is missing, as we have seen in some of the phone number inputs. // In that case, we append everything from the beginning. int indexOfRfc3966Prefix = numberToParse.indexOf(RFC3966_PREFIX); - int indexOfNationalNumber = (indexOfRfc3966Prefix >= 0) - ? indexOfRfc3966Prefix + RFC3966_PREFIX.length() : 0; + int indexOfNationalNumber = + (indexOfRfc3966Prefix >= 0) ? indexOfRfc3966Prefix + RFC3966_PREFIX.length() : 0; nationalNumber.append(numberToParse.substring(indexOfNationalNumber, indexOfPhoneContext)); } else { // Extract a possible number from the string passed in (this strips leading characters that 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 2aee93f4..5823ac65 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 8525121e..07c87f3a 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_AG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG Binary files differindex 8e47a02e..0bc9ed0e 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 dccd5ff8..23ab06d3 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_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS Binary files differindex 6d3c5208..0e469da7 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 63751f05..36776f8c 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 c7c2a072..1df97bf0 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_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB Binary files differindex 21fa36d6..5acaf638 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 a55e4c08..fd80abf4 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 cfcf24e6..cd22d63f 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_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG Binary files differindex e72617d9..503a5581 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_BJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ Binary files differindex e1a1e963..469fa001 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 a085560f..c237a21e 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 cfba4ed9..c68f4e61 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_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS Binary files differindex 4ad55c9a..632e4702 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_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex aa99ea8e..41b15598 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 14bb719f..761d4e4c 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_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF Binary files differindex 2b9ea345..b7b75580 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 6e0d89eb..f12515e1 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_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL Binary files differindex 379bf4b1..d421d377 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_CN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN Binary files differindex 1b2b8878..f9487ddf 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_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX Binary files differindex 558ee3fc..d2b53aec 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_DM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM Binary files differindex 7ed2cc27..ca45af47 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 ebbb6314..cf17a668 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_EE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE Binary files differindex 63cd3888..5b5c6136 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_ET b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET Binary files differindex 55376663..260021e0 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_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR Binary files differindex 0bb9f8c2..56c0213d 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_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB Binary files differindex 8e3dec5a..693084d6 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 2c15174a..2bbdd30c 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 c180b1ec..50a945e3 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 abbc8fe9..1d0c9ea8 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 7ec18c87..a24f8ea8 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 80442561..5456c9c6 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 05a4f265..9d235f9d 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_GM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM Binary files differindex 267ddcf4..6015e71f 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_GP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP Binary files differindex 4b84cca3..596bdf5a 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_GU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU Binary files differindex e9cba0ee..60d12357 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_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN Binary files differindex 70bf5858..9d6485f3 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 733abe8b..416739c3 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 611403ed..f5a17148 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_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL Binary files differindex 398f0e8f..26e5a9bf 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 ef69c80d..f5644a27 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_IR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR Binary files differindex 2d8dd741..d5dc307f 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_JE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE Binary files differindex 6b421e7c..3b2e254a 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 3be52282..bd887884 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_KI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI Binary files differindex faa711a9..e1beb0cd 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_KN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN Binary files differindex 4ca1edf9..38cf64de 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_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW Binary files differindex 0a285e2d..1b22c0b5 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 2db07db0..ec90682d 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_LA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA Binary files differindex 13a0366e..a2ed8d32 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_LC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC Binary files differindex e6c9f0cd..a58b13c3 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 e8050bc1..5e0e8589 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_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR Binary files differindex f2e7b9b2..02e6927d 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_MF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF Binary files differindex 7971a3ef..809b0008 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 53b6208e..ebf6d810 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 8047ea0d..222621e1 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 8f630e15..36646548 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_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM Binary files differindex e6a28130..f641a4a7 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 07b730bd..0f92ca9d 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_MP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP Binary files differindex e42af97c..ab31e8be 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 2247c340..a8f97d28 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_MS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS Binary files differindex 237c68e7..dabe35c9 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_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU Binary files differindex 14f4e803..4cfe5140 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 3bcb9974..2c596fed 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_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX Binary files differindex d53429f8..b7a33811 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 b356cb2a..42485a3c 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_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO Binary files differindex 3a806356..dcc4c58c 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_NZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ Binary files differindex 419139f4..f575b300 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 2315c0a0..afed53a9 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_PM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM Binary files differindex 3d5e488f..f9a87168 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 66c7fae1..2760fe36 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_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT Binary files differindex d44d9949..6e05f410 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_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA Binary files differindex d2935ac7..1e089e19 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 5e305afa..f2b0e960 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 bb166440..70ac9c9e 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_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG Binary files differindex 4bbcaec4..8013697b 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_SI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI Binary files differindex 30b2f1a5..1a01783c 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_SX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX Binary files differindex e60b5eea..929086a5 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_TC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC Binary files differindex 7fdbb903..c8eadbcf 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 5478d8a1..0e638bde 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 78c1d9ba..894d9b32 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_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ Binary files differindex 4bd54c89..a904373d 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_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT Binary files differindex 75c276b1..a8a5a5b7 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_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US Binary files differindex 85d30f6e..8481de75 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_UZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ Binary files differindex 9e68b96e..4c1bf8f1 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_VC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC Binary files differindex e46b9938..5e5a5485 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_VG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG Binary files differindex 52c957fc..7abc5c08 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 12cb14a8..cf071061 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 1a6db405..3cba0f15 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_YE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE Binary files differindex 5fb02177..615db52e 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 e85d5972..69d5c921 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/ShortNumberMetadataProto_AT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_AT Binary files differindex 3d48cad9..fec271cb 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_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE Binary files differindex f8b3976c..3967c15c 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_CH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CH Binary files differindex 82852bb3..fcafbbeb 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_CZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ Binary files differindex 7a682edf..b5cfbdc7 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_DK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_DK Binary files differindex c450ec8b..b3875151 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_FO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FO Binary files differindex 1bb54a82..dd4dd01a 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 f4f8062a..ada71b06 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_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_JO Binary files differindex f5f56473..ec29ccde 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_QA b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_QA Binary files differindex e51d2ae0..60774e90 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_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SC Binary files differindex d09b3159..b3b13e73 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/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index 6a466e43..c97d09c2 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -2122,10 +2122,6 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { phoneUtil.parse("tel:253-0000;phone-context=www.google.com", RegionCode.US)); assertEquals(US_LOCAL_NUMBER, phoneUtil.parse("tel:253-0000;isub=12345;phone-context=www.google.com", RegionCode.US)); - // This is invalid because no "+" sign is present as part of phone-context. The phone context - // is simply ignored in this case just as if it contains a domain. - assertEquals(US_LOCAL_NUMBER, - phoneUtil.parse("tel:2530000;isub=12345;phone-context=1-650", RegionCode.US)); assertEquals(US_LOCAL_NUMBER, phoneUtil.parse("tel:2530000;isub=12345;phone-context=1234.com", RegionCode.US)); @@ -2539,18 +2535,18 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { // succeed in being parsed. String invalidRfcPhoneContext = "tel:555-1234;phone-context=1-331"; phoneUtil.parse(invalidRfcPhoneContext, RegionCode.ZZ); - fail("'Unknown' region code not allowed: should fail."); + fail("phone-context is missing '+' sign: should fail."); } catch (NumberParseException e) { // Expected this exception. assertEquals("Wrong error type stored in exception.", - NumberParseException.ErrorType.INVALID_COUNTRY_CODE, + NumberParseException.ErrorType.NOT_A_NUMBER, e.getErrorType()); } try { // Only the phone-context symbol is present, but no data. String invalidRfcPhoneContext = ";phone-context="; phoneUtil.parse(invalidRfcPhoneContext, RegionCode.ZZ); - fail("No number is present: should fail."); + fail("phone-context can't be empty: should fail."); } catch (NumberParseException e) { // Expected this exception. assertEquals("Wrong error type stored in exception.", @@ -2895,6 +2891,69 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertEquals(threeZeros, phoneUtil.parse("0000", RegionCode.AU)); } + public void testParseWithPhoneContext() throws Exception { + // context = ";phone-context=" descriptor + // descriptor = domainname / global-number-digits + + // Valid global-phone-digits + assertEquals(NZ_NUMBER, phoneUtil.parse("tel:033316005;phone-context=+64", RegionCode.ZZ)); + assertEquals( + NZ_NUMBER, + phoneUtil.parse( + "tel:033316005;phone-context=+64;{this isn't part of phone-context anymore!}", + RegionCode.ZZ)); + PhoneNumber nzFromPhoneContext = new PhoneNumber(); + nzFromPhoneContext.setCountryCode(64).setNationalNumber(3033316005L); + assertEquals( + nzFromPhoneContext, + phoneUtil.parse("tel:033316005;phone-context=+64-3", RegionCode.ZZ)); + PhoneNumber brFromPhoneContext = new PhoneNumber(); + brFromPhoneContext.setCountryCode(55).setNationalNumber(5033316005L); + assertEquals( + brFromPhoneContext, + phoneUtil.parse("tel:033316005;phone-context=+(555)", RegionCode.ZZ)); + PhoneNumber usFromPhoneContext = new PhoneNumber(); + usFromPhoneContext.setCountryCode(1).setNationalNumber(23033316005L); + assertEquals( + usFromPhoneContext, + phoneUtil.parse("tel:033316005;phone-context=+-1-2.3()", RegionCode.ZZ)); + + // Valid domainname + assertEquals(NZ_NUMBER, phoneUtil.parse("tel:033316005;phone-context=abc.nz", RegionCode.NZ)); + assertEquals( + NZ_NUMBER, + phoneUtil.parse("tel:033316005;phone-context=www.PHONE-numb3r.com", RegionCode.NZ)); + assertEquals(NZ_NUMBER, phoneUtil.parse("tel:033316005;phone-context=a", RegionCode.NZ)); + assertEquals( + NZ_NUMBER, phoneUtil.parse("tel:033316005;phone-context=3phone.J.", RegionCode.NZ)); + assertEquals(NZ_NUMBER, phoneUtil.parse("tel:033316005;phone-context=a--z", RegionCode.NZ)); + + // Invalid descriptor + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context="); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=+"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=64"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=++64"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=+abc"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=."); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=3phone"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=a-.nz"); + assertThrowsForInvalidPhoneContext("tel:033316005;phone-context=a{b}c"); + } + + private void assertThrowsForInvalidPhoneContext(String numberToParse) { + final String numberToParseFinal = numberToParse; + assertEquals( + NumberParseException.ErrorType.NOT_A_NUMBER, + assertThrows( + NumberParseException.class, new ThrowingRunnable() { + @Override + public void run() throws Throwable { + phoneUtil.parse(numberToParseFinal, RegionCode.ZZ); + } + }) + .getErrorType()); + } + public void testCountryWithNoNumberDesc() { // Andorra is a country where we don't have PhoneNumberDesc info in the metadata. PhoneNumber adNumber = new PhoneNumber(); @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.13.2</version> + <version>8.13.14</version> <packaging>pom</packaging> <url>https://github.com/google/libphonenumber/</url> @@ -34,7 +34,7 @@ <connection>scm:git:https://github.com/google/libphonenumber.git</connection> <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection> <url>https://github.com/google/libphonenumber/</url> - <tag>v8.13.2</tag> + <tag>v8.13.14</tag> </scm> <properties> @@ -169,6 +169,7 @@ <plugin> <groupId>org.sonatype.plugins</groupId> <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.13</version> <extensions>true</extensions> <configuration> <serverId>sonatype-nexus-staging</serverId> @@ -237,10 +238,9 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.10.19</version> + <artifactId>mockito-core</artifactId> + <version>2.23.4</version> <scope>test</scope> </dependency> </dependencies> - </project> diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1428_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1428_en Binary files differnew file mode 100644 index 00000000..faa1cff6 --- /dev/null +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1428_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1472_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1472_en Binary files differnew file mode 100644 index 00000000..7a465d62 --- /dev/null +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1472_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1557_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1557_en Binary files differnew file mode 100644 index 00000000..de3a8cd1 --- /dev/null +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1557_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en Binary files differindex f2b6c5ad..04919d16 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/251_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en Binary files differdeleted file mode 100644 index d8b8de7d..00000000 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en +++ /dev/null diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr Binary files differdeleted file mode 100644 index eb983e1c..00000000 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_fr +++ /dev/null diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en Binary files differindex 8cad8daf..a236ca15 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/504_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en Binary files differindex e1006cd9..e1d17724 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/52_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en Binary files differindex 3fc7f68a..a1ee5c2e 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/57_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en Binary files differindex b5cd9779..08ab42db 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/61_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en Binary files differindex 32876c45..2c08ebf4 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/686_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_en Binary files differindex 17db7e24..48ea7c2d 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_zh b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_zh Binary files differindex 287e04eb..2ab9c681 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_zh +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/86_zh diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/95_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/95_en Binary files differindex de3d3c6a..953ca978 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/95_en +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/95_en diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config Binary files differindex af83ebc2..8522ceb3 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data Binary files differindex 26828e26..aaa202fc 100644 --- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data +++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/timezones/data/map_data diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/NumberParseException.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/NumberParseException.java index 48075f8d..a82b2134 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/NumberParseException.java +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/NumberParseException.java @@ -34,9 +34,10 @@ public class NumberParseException extends Exception { */ INVALID_COUNTRY_CODE, /** - * This generally indicates the string passed in had less than 3 digits in it. More - * specifically, the number failed to match the regular expression VALID_PHONE_NUMBER in - * PhoneNumberUtil.java. + * This indicates the string passed is not a valid number. Either the string had less than 3 + * digits in it or had an invalid phone-context parameter. More specifically, the number failed + * to match the regular expression VALID_PHONE_NUMBER, RFC3966_GLOBAL_NUMBER_DIGITS, or + * RFC3966_DOMAINNAME in PhoneNumberUtil.java. */ NOT_A_NUMBER, /** diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java index 77f1a13c..402562c8 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/PhoneNumberUtil.java @@ -308,6 +308,27 @@ public class PhoneNumberUtil { private static final String EXTN_PATTERNS_FOR_PARSING = createExtnPattern(true); static final String EXTN_PATTERNS_FOR_MATCHING = createExtnPattern(false); + // Regular expression of valid global-number-digits for the phone-context parameter, following the + // syntax defined in RFC3966. + private static final String RFC3966_VISUAL_SEPARATOR = "[\\-\\.\\(\\)]?"; + private static final String RFC3966_PHONE_DIGIT = + "(" + DIGITS + "|" + RFC3966_VISUAL_SEPARATOR + ")"; + private static final String RFC3966_GLOBAL_NUMBER_DIGITS = + "^\\" + PLUS_SIGN + RFC3966_PHONE_DIGIT + "*" + DIGITS + RFC3966_PHONE_DIGIT + "*$"; + static final Pattern RFC3966_GLOBAL_NUMBER_DIGITS_PATTERN = + Pattern.compile(RFC3966_GLOBAL_NUMBER_DIGITS); + + // Regular expression of valid domainname for the phone-context parameter, following the syntax + // defined in RFC3966. + private static final String ALPHANUM = VALID_ALPHA + DIGITS; + private static final String RFC3966_DOMAINLABEL = + "[" + ALPHANUM + "]+((\\-)*[" + ALPHANUM + "])*"; + private static final String RFC3966_TOPLABEL = + "[" + VALID_ALPHA + "]+((\\-)*[" + ALPHANUM + "])*"; + private static final String RFC3966_DOMAINNAME = + "^(" + RFC3966_DOMAINLABEL + "\\.)*" + RFC3966_TOPLABEL + "\\.?$"; + static final Pattern RFC3966_DOMAINNAME_PATTERN = Pattern.compile(RFC3966_DOMAINNAME); + /** * Helper method for constructing regular expressions for parsing. Creates an expression that * captures up to maxLength digits. @@ -3384,26 +3405,70 @@ public class PhoneNumberUtil { } /** + * Extracts the value of the phone-context parameter of numberToExtractFrom where the index of + * ";phone-context=" is the parameter indexOfPhoneContext, following the syntax defined in + * RFC3966. + * + * @return the extracted string (possibly empty), or null if no phone-context parameter is found. + */ + private String extractPhoneContext(String numberToExtractFrom, int indexOfPhoneContext) { + // If no phone-context parameter is present + if (indexOfPhoneContext == -1) { + return null; + } + + int phoneContextStart = indexOfPhoneContext + RFC3966_PHONE_CONTEXT.length(); + // If phone-context parameter is empty + if (phoneContextStart >= numberToExtractFrom.length()) { + return ""; + } + + int phoneContextEnd = numberToExtractFrom.indexOf(';', phoneContextStart); + // If phone-context is not the last parameter + if (phoneContextEnd != -1) { + return numberToExtractFrom.substring(phoneContextStart, phoneContextEnd); + } else { + return numberToExtractFrom.substring(phoneContextStart); + } + } + + /** + * Returns whether the value of phoneContext follows the syntax defined in RFC3966. + */ + private boolean isPhoneContextValid(String phoneContext) { + if (phoneContext == null) { + return true; + } + if (phoneContext.length() == 0) { + return false; + } + + // Does phone-context value match pattern of global-number-digits or domainname + return RFC3966_GLOBAL_NUMBER_DIGITS_PATTERN.matcher(phoneContext).matches() + || RFC3966_DOMAINNAME_PATTERN.matcher(phoneContext).matches(); + } + + /** * Converts numberToParse to a form that we can parse and write it to nationalNumber if it is * written in RFC3966; otherwise extract a possible number out of it and write to nationalNumber. */ - private void buildNationalNumberForParsing(String numberToParse, StringBuilder nationalNumber) { + private void buildNationalNumberForParsing(String numberToParse, StringBuilder nationalNumber) + throws NumberParseException { int indexOfPhoneContext = numberToParse.indexOf(RFC3966_PHONE_CONTEXT); - if (indexOfPhoneContext >= 0) { - int phoneContextStart = indexOfPhoneContext + RFC3966_PHONE_CONTEXT.length(); + + String phoneContext = extractPhoneContext(numberToParse, indexOfPhoneContext); + if (!isPhoneContextValid(phoneContext)) { + throw new NumberParseException(NumberParseException.ErrorType.NOT_A_NUMBER, + "The phone-context value is invalid."); + } + if (phoneContext != null) { // If the phone context contains a phone number prefix, we need to capture it, whereas domains // will be ignored. - if (phoneContextStart < (numberToParse.length() - 1) - && numberToParse.charAt(phoneContextStart) == PLUS_SIGN) { + if (phoneContext.charAt(0) == PLUS_SIGN) { // Additional parameters might follow the phone context. If so, we will remove them here - // because the parameters after phone context are not important for parsing the - // phone number. - int phoneContextEnd = numberToParse.indexOf(';', phoneContextStart); - if (phoneContextEnd > 0) { - nationalNumber.append(numberToParse.substring(phoneContextStart, phoneContextEnd)); - } else { - nationalNumber.append(numberToParse.substring(phoneContextStart)); - } + // because the parameters after phone context are not important for parsing the phone + // number. + nationalNumber.append(phoneContext); } // Now append everything between the "tel:" prefix and the phone-context. This should include @@ -3411,8 +3476,8 @@ public class PhoneNumberUtil { // handle the case when "tel:" is missing, as we have seen in some of the phone number inputs. // In that case, we append everything from the beginning. int indexOfRfc3966Prefix = numberToParse.indexOf(RFC3966_PREFIX); - int indexOfNationalNumber = (indexOfRfc3966Prefix >= 0) - ? indexOfRfc3966Prefix + RFC3966_PREFIX.length() : 0; + int indexOfNationalNumber = + (indexOfRfc3966Prefix >= 0) ? indexOfRfc3966Prefix + RFC3966_PREFIX.length() : 0; nationalNumber.append(numberToParse.substring(indexOfNationalNumber, indexOfPhoneContext)); } else { // Extract a possible number from the string passed in (this strips leading characters that diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 Binary files differindex 2aee93f4..5823ac65 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_882 diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 Binary files differindex 8525121e..07c87f3a 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_883 diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG Binary files differindex 8e47a02e..0bc9ed0e 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI Binary files differindex dccd5ff8..23ab06d3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS Binary files differindex 6d3c5208..0e469da7 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT Binary files differindex 63751f05..36776f8c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU Binary files differindex c7c2a072..1df97bf0 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB Binary files differindex 21fa36d6..5acaf638 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD Binary files differindex a55e4c08..fd80abf4 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE Binary files differindex cfcf24e6..cd22d63f 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG Binary files differindex e72617d9..503a5581 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ Binary files differindex e1a1e963..469fa001 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BJ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL Binary files differindex a085560f..c237a21e 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BL diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM Binary files differindex cfba4ed9..c68f4e61 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS Binary files differindex 4ad55c9a..632e4702 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex aa99ea8e..41b15598 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC Binary files differindex 14bb719f..761d4e4c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF Binary files differindex 2b9ea345..b7b75580 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CF diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG Binary files differindex 6e0d89eb..f12515e1 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL Binary files differindex 379bf4b1..d421d377 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN Binary files differindex 1b2b8878..f9487ddf 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX Binary files differindex 558ee3fc..d2b53aec 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM Binary files differindex 7ed2cc27..ca45af47 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO Binary files differindex ebbb6314..cf17a668 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_DO diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE Binary files differindex 63cd3888..5b5c6136 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET Binary files differindex 55376663..260021e0 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_ET diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR Binary files differindex 0bb9f8c2..56c0213d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB Binary files differindex 8e3dec5a..693084d6 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD Binary files differindex 2c15174a..2bbdd30c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GD diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE Binary files differindex c180b1ec..50a945e3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF Binary files differindex abbc8fe9..1d0c9ea8 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GF diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG Binary files differindex 7ec18c87..a24f8ea8 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH Binary files differindex 80442561..5456c9c6 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GH diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI Binary files differindex 05a4f265..9d235f9d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM Binary files differindex 267ddcf4..6015e71f 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP Binary files differindex 4b84cca3..596bdf5a 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GP diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU Binary files differindex e9cba0ee..60d12357 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_GU diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN Binary files differindex 70bf5858..9d6485f3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR Binary files differindex 733abe8b..416739c3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT Binary files differindex 611403ed..f5a17148 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL Binary files differindex 398f0e8f..26e5a9bf 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM Binary files differindex ef69c80d..f5644a27 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR Binary files differindex 2d8dd741..d5dc307f 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE Binary files differindex 6b421e7c..3b2e254a 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM Binary files differindex 3be52282..bd887884 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI Binary files differindex faa711a9..e1beb0cd 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN Binary files differindex 4ca1edf9..38cf64de 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KN diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW Binary files differindex 0a285e2d..1b22c0b5 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY Binary files differindex 2db07db0..ec90682d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA Binary files differindex 13a0366e..a2ed8d32 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC Binary files differindex e6c9f0cd..a58b13c3 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LC diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI Binary files differindex e8050bc1..5e0e8589 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR Binary files differindex f2e7b9b2..02e6927d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF Binary files differindex 7971a3ef..809b0008 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MF diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG Binary files differindex 53b6208e..ebf6d810 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH Binary files differindex 8047ea0d..222621e1 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MH diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK Binary files differindex 8f630e15..36646548 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM Binary files differindex e6a28130..f641a4a7 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN Binary files differindex 07b730bd..0f92ca9d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP Binary files differindex e42af97c..ab31e8be 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MP diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ Binary files differindex 2247c340..a8f97d28 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MQ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS Binary files differindex 237c68e7..dabe35c9 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MS diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU Binary files differindex 14f4e803..4cfe5140 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV Binary files differindex 3bcb9974..2c596fed 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX Binary files differindex d53429f8..b7a33811 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY Binary files differindex b356cb2a..42485a3c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO Binary files differindex 3a806356..dcc4c58c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NO diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ Binary files differindex 419139f4..f575b300 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM Binary files differindex 2315c0a0..afed53a9 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_OM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM Binary files differindex 3d5e488f..f9a87168 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PM diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR Binary files differindex 66c7fae1..2760fe36 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT Binary files differindex d44d9949..6e05f410 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA Binary files differindex d2935ac7..1e089e19 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE Binary files differindex 5e305afa..f2b0e960 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO Binary files differindex bb166440..70ac9c9e 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG Binary files differindex 4bbcaec4..8013697b 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI Binary files differindex 30b2f1a5..1a01783c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX Binary files differindex e60b5eea..929086a5 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_SX diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC Binary files differindex 7fdbb903..c8eadbcf 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TC diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD Binary files differindex 5478d8a1..0e638bde 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG Binary files differindex 78c1d9ba..894d9b32 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ Binary files differindex 4bd54c89..a904373d 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT Binary files differindex 75c276b1..a8a5a5b7 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US Binary files differindex 85d30f6e..8481de75 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_US diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ Binary files differindex 9e68b96e..4c1bf8f1 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC Binary files differindex e46b9938..5e5a5485 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VC diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG Binary files differindex 52c957fc..7abc5c08 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VG diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI Binary files differindex 12cb14a8..cf071061 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN Binary files differindex 1a6db405..3cba0f15 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE Binary files differindex 5fb02177..615db52e 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT Binary files differindex e85d5972..69d5c921 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AT b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AT Binary files differindex 3d48cad9..fec271cb 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AT +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_AT diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE Binary files differindex f8b3976c..3967c15c 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_BE diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CH b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CH Binary files differindex 82852bb3..fcafbbeb 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CH +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CH diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ Binary files differindex 7a682edf..b5cfbdc7 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_CZ diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DK b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DK Binary files differindex c450ec8b..b3875151 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DK +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_DK diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FO Binary files differindex 1bb54a82..dd4dd01a 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FO +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FO diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR Binary files differindex f4f8062a..ada71b06 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_FR diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO Binary files differindex f5f56473..ec29ccde 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_JO diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_QA b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_QA Binary files differindex e51d2ae0..60774e90 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_QA +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_QA diff --git a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC Binary files differindex d09b3159..b3b13e73 100644 --- a/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC +++ b/repackaged/libphonenumber/src/com/android/i18n/phonenumbers/data/ShortNumberMetadataProto_SC |