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

18 files changed, 7 insertions, 19 deletions

diff --git a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
index 9bfa79fb..217587ba 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/PhoneNumberToTimeZonesMapper.java
@@ -45,7 +45,7 @@ public class PhoneNumberToTimeZonesMapper {
     UNKNOWN_TIME_ZONE_LIST.add(UNKNOWN_TIMEZONE);
   }
 
-  private static final Logger LOGGER =
+  private static final Logger logger =
       Logger.getLogger(PhoneNumberToTimeZonesMapper.class.getName());
 
   private PrefixTimeZonesMap prefixTimeZonesMap = null;
@@ -68,7 +68,7 @@ public class PhoneNumberToTimeZonesMapper {
       in = new ObjectInputStream(source);
       map.readExternal(in);
     } catch (IOException e) {
-      LOGGER.log(Level.WARNING, e.toString());
+      logger.log(Level.WARNING, e.toString());
     } finally {
       close(in);
     }
@@ -80,7 +80,7 @@ public class PhoneNumberToTimeZonesMapper {
       try {
         in.close();
       } catch (IOException e) {
-        LOGGER.log(Level.WARNING, e.toString());
+        logger.log(Level.WARNING, e.toString());
       }
     }
   }
@@ -137,26 +137,14 @@ public class PhoneNumberToTimeZonesMapper {
     PhoneNumberType numberType = PhoneNumberUtil.getInstance().getNumberType(number);
     if (numberType == PhoneNumberType.UNKNOWN) {
       return UNKNOWN_TIME_ZONE_LIST;
-    } else if (!canBeGeocoded(numberType)) {
+    } else if (!PhoneNumberUtil.getInstance().isNumberGeographical(
+        numberType, number.getCountryCode())) {
       return getCountryLevelTimeZonesforNumber(number);
     }
     return getTimeZonesForGeographicalNumber(number);
   }
 
   /**
-   * A similar method is implemented as PhoneNumberUtil.isNumberGeographical, which performs a
-   * stricter check, as it determines if a number has a geographical association. Also, if new
-   * phone number types were added, we should check if this other method should be updated too.
-   * TODO: Remove duplication by completing the logic in the method in PhoneNumberUtil.
-   *                   For more information, see the comments in that method.
-   */
-  private boolean canBeGeocoded(PhoneNumberType numberType) {
-    return (numberType == PhoneNumberType.FIXED_LINE ||
-            numberType == PhoneNumberType.MOBILE ||
-            numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE);
-  }
-
-  /**
    * Returns a String with the ICU unknown time zone.
    */
   public static String getUnknownTimeZone() {
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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