summaryrefslogtreecommitdiff
path: root/carrier
diff options
context:
space:
mode:
Diffstat (limited to 'carrier')
-rw-r--r--carrier/pom.xml8
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java10
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_enbin176 -> 308 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_enbin165 -> 180 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_enbin130 -> 148 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_enbin139 -> 175 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/212_enbin543 -> 555 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/223_enbin180 -> 186 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/226_enbin193 -> 197 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/230_enbin287 -> 297 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/233_enbin139 -> 143 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/234_enbin408 -> 411 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/237_enbin174 -> 188 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/244_enbin68 -> 89 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/251_enbin38 -> 53 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/252_enbin284 -> 296 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/254_enbin303 -> 328 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/255_enbin228 -> 176 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/260_enbin72 -> 98 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/262_enbin737 -> 733 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/27_enbin922 -> 931 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/297_enbin143 -> 149 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/298_enbin124 -> 128 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/31_enbin662 -> 662 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/33_enbin2848 -> 2866 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/34_enbin2108 -> 2120 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/350_enbin43 -> 95 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/351_enbin306 -> 421 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/354_enbin353 -> 359 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/357_enbin106 -> 113 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/359_enbin98 -> 210 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/370_enbin574 -> 770 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/371_enbin0 -> 1178 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/372_enbin435 -> 441 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/380_enbin184 -> 190 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/380_ukbin180 -> 186 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/381_enbin163 -> 169 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/385_enbin149 -> 205 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/386_enbin220 -> 229 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/389_enbin112 -> 169 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/41_enbin690 -> 726 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/420_enbin1754 -> 1748 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/421_enbin413 -> 419 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/44_enbin4828 -> 4858 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/46_enbin5756 -> 5798 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/47_enbin2778 -> 2820 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/48_enbin2230 -> 2278 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/503_enbin1194 -> 1242 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/51_enbin2274 -> 2286 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/56_enbin20196 -> 20286 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/57_enbin1846 -> 1852 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/592_enbin235 -> 247 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/594_enbin159 -> 191 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/60_enbin2161 -> 2189 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/61_enbin928 -> 964 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/65_enbin2829 -> 2893 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/675_enbin105 -> 111 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/7_enbin6528 -> 6540 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/7_rubin2954 -> 2966 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/852_enbin2407 -> 2431 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zhbin2008 -> 2032 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/86_enbin457 -> 468 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/882_enbin188 -> 204 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/90_enbin564 -> 582 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/960_enbin108 -> 114 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/963_enbin134 -> 154 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/972_enbin412 -> 420 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/974_enbin210 -> 234 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/976_enbin174 -> 196 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/977_enbin183 -> 195 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/98_enbin233 -> 239 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fabin294 -> 300 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/992_enbin239 -> 239 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/995_enbin482 -> 506 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/996_enbin238 -> 244 bytes
-rw-r--r--carrier/src/com/google/i18n/phonenumbers/carrier/data/configbin2833 -> 2845 bytes
76 files changed, 8 insertions, 10 deletions
diff --git a/carrier/pom.xml b/carrier/pom.xml
index 0ed9500a..bbcf06ca 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.172</version>
+ <version>1.186</version>
<packaging>jar</packaging>
<url>https://github.com/google/libphonenumber/</url>
<parent>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber-parent</artifactId>
- <version>8.12.46</version>
+ <version>8.13.2</version>
</parent>
<build>
@@ -55,12 +55,12 @@
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
- <version>8.12.46</version>
+ <version>8.13.2</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>prefixmapper</artifactId>
- <version>2.182</version>
+ <version>2.196</version>
</dependency>
</dependencies>
diff --git a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
index b99abe6e..ed3d6d88 100644
--- a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
+++ b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java
@@ -16,11 +16,10 @@
package com.google.i18n.phonenumbers;
-import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.google.i18n.phonenumbers.metadata.DefaultMetadataDependenciesProvider;
import com.google.i18n.phonenumbers.prefixmapper.PrefixFileReader;
-
import java.util.Locale;
/**
@@ -30,9 +29,7 @@ import java.util.Locale;
*/
public class PhoneNumberToCarrierMapper {
private static PhoneNumberToCarrierMapper instance = null;
- private static final String MAPPING_DATA_DIRECTORY =
- "/com/google/i18n/phonenumbers/carrier/data/";
- private PrefixFileReader prefixFileReader = null;
+ private final PrefixFileReader prefixFileReader;
private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
@@ -51,7 +48,8 @@ public class PhoneNumberToCarrierMapper {
*/
public static synchronized PhoneNumberToCarrierMapper getInstance() {
if (instance == null) {
- instance = new PhoneNumberToCarrierMapper(MAPPING_DATA_DIRECTORY);
+ instance = new PhoneNumberToCarrierMapper(DefaultMetadataDependenciesProvider.getInstance()
+ .getCarrierDataDirectory());
}
return instance;
}
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
index 8ffce001..1368ea03 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
index 39013444..f687d25c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1345_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
index 3a4269aa..32f3cff6 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1441_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en
index 31a24534..8a02131d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1671_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
index 05983c7e..3043e637 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
index 5c04fd1f..f8217c8f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/223_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
index 88130d58..8230d0aa 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/226_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
index 491a1575..18bebd89 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
index 66bb3700..74a2f86f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/233_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
index 81766ae5..2df7a9cd 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/234_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
index 729f6508..483a7655 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/244_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/244_en
index 48e01f4c..e47a30a8 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/244_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/244_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en
index 354c0111..8e13f331 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/251_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
index c3efeaa3..3727d1df 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
index 60412710..ea8d7761 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
index 9d339808..934080cc 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
index a36efe99..7c1948b3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/260_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
index 1df02841..74a5de6f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/262_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
index 75fee289..2d19a2ec 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
index 15cca8e9..86234807 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/297_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
index e3a67dac..1f76f32a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/298_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
index 594eba31..2f0392ed 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/31_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
index 0438dc33..a6405376 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/33_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
index 42dbe35a..2e9b8910 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/34_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
index 194932b6..45d58073 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/350_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
index 6e730420..fc8db80c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/351_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
index 15476176..f7731a6f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/354_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en
index f5ef9fe9..dab92f90 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/357_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
index a589090f..2c606079 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
index 32cd4aac..45c218b5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/370_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/371_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/371_en
new file mode 100644
index 00000000..93d9cd72
--- /dev/null
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/371_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
index b07561a9..1de891a3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/372_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
index 43384783..609b47f3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_uk b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_uk
index f4756ff7..add3a08a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_uk
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_uk
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
index e536083a..ee0b5050 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/381_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
index 3e9b2db4..cd4d92d5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
index c0b89dec..461263c5 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/386_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
index c430180b..3d93178c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
index 058355f2..d5820e5a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
index a17f7d80..427db09c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/420_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
index 83605f0a..424ea380 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/421_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
index 79b9f945..e764cc8a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/44_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
index 719c0bc4..1af5a6cb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/46_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
index 5917b78b..f8caba63 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/47_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
index 66546b28..5a2cac7d 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/48_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
index 57520a34..69a232b7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/503_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
index a651fce2..1c2a50a2 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/51_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
index 67386fe3..056751d1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
index 811c55d2..28dcf499 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/57_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
index 721044b6..ce6352d1 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en
index 792c89c6..a1223017 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/594_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
index 28ea3fc5..a7021aa8 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
index f8608c15..eec8044e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
index 9dc543a2..490a94fe 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
index 328156d4..c044c835 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/675_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
index 25861521..ab76084a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
index eca5c78a..ead9c8e3 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_ru
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
index 6828fc69..05339f91 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
index 7669b5b7..f05af53e 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/852_zh
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
index 1e2437c1..2d943068 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
index 0a28266b..91655150 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/882_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
index 98195276..1c3f9e3f 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/90_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
index 897de587..a332eae9 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
index 593e0c46..ee4fe314 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/963_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
index 862fba3f..096ff95c 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
index c34cabb5..380bc731 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/974_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
index 5e41d40c..7be52323 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en
index 1a3376bc..94d491a7 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
index 24d29024..cafaee21 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
index b7635df2..cdacabfb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/98_fa
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
index 74499f5a..ba145f1a 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
index 9275bbed..c7243dbb 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/995_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
index 1a790e74..272ad352 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en
Binary files differ
diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
index 9ba15aba..014fee31 100644
--- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
+++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config
Binary files differ