summaryrefslogtreecommitdiff
path: root/geocoder/src/com/google/i18n/phonenumbers/geocoding
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2016-11-28 11:47:19 +0000
committerPaul Duffin <paulduffin@google.com>2016-11-28 13:33:03 +0000
commita805e0c533932dc3e7d640c12f3e6c949ddfdd20 (patch)
treec56dc46cdcd1df238d6f37f64fc9f68a33921357 /geocoder/src/com/google/i18n/phonenumbers/geocoding
parent78b57ad8097f172cc084be1b15ee6d2fe446c79c (diff)
downloadlibphonenumber-a805e0c533932dc3e7d640c12f3e6c949ddfdd20.tar.gz
Upgrade to 7.7.5
Created using ./update-from-external.sh 7.7.5 m -j32 droid adb reboot bootloader fastboot flashall -w m -j32 cts cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest m -j32 libphonenumber-test vogar --timeout 0 \ --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jack \ com.google.i18n.phonenumbers Bug: 31792965 Test: As described above Change-Id: If5beda5d9a2d8a616eefb97893335344a8a5f73a
Diffstat (limited to 'geocoder/src/com/google/i18n/phonenumbers/geocoding')
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java4
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1249_enbin0 -> 32 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1343_enbin0 -> 32 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1463_enbin0 -> 32 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1579_enbin0 -> 31 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1581_enbin0 -> 31 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_enbin36 -> 57 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_enbin295 -> 342 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_enbin1649 -> 1670 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv (renamed from geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se)bin498 -> 498 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_enbin136 -> 142 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_enbin678 -> 655 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_esbin170 -> 156 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_enbin5251 -> 5263 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_rubin3075 -> 3097 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/960_enbin0 -> 473 bytes
-rw-r--r--geocoder/src/com/google/i18n/phonenumbers/geocoding/data/configbin5792 -> 5864 bytes
17 files changed, 2 insertions, 2 deletions
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index f4dc6aad..d0869e5b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -88,8 +88,8 @@ public class PhoneNumberOfflineGeocoder {
* Returns the customary display name in the given language for the given region.
*/
private String getRegionDisplayName(String regionCode, Locale language) {
- return (regionCode == null || regionCode.equals("ZZ") ||
- regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY))
+ return (regionCode == null || regionCode.equals("ZZ")
+ || regionCode.equals(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY))
? "" : new Locale("", regionCode).getDisplayCountry(language);
}
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1249_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1249_en
new file mode 100644
index 00000000..c3f6671e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1249_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1343_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1343_en
new file mode 100644
index 00000000..30fa7eda
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1343_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1463_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1463_en
new file mode 100644
index 00000000..ccc7fac6
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1463_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1579_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1579_en
new file mode 100644
index 00000000..9574f1e7
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1579_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1581_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1581_en
new file mode 100644
index 00000000..223fd37e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1581_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en
index 4968fec9..cfa9b297 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1782_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
index 3623f93c..05fbabf3 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1867_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
index 6184bed1..2db24b21 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1902_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
index 74fa2da8..74fa2da8 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
index 24aedf80..47108244 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
index d3768297..a6724ae3 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
index e8267fcb..b453a4e5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
index becd121f..bf919817 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
index 746a1c64..a89176aa 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/7_ru
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/960_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/960_en
new file mode 100644
index 00000000..b1f951fe
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/960_en
Binary files differ
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 7b3822ce..a94e83f5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
Binary files differ