Merge "Update libphonenumber to v8.12.54" am: 84f52584d0 am: 93a35a2c43

Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/2192266

Change-Id: I426740f2cae703a9ce0f6c2a54d102bd2df25a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

22 files changed, 4 insertions, 4 deletions

diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index 34829607..e40d68ab 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -21,6 +21,7 @@ import com.android.i18n.phonenumbers.NumberParseException;
 import com.android.i18n.phonenumbers.PhoneNumberUtil;
 import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberType;
 import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;
+import com.android.i18n.phonenumbers.metadata.DefaultMetadataDependenciesProvider;
 import com.android.i18n.phonenumbers.prefixmapper.PrefixFileReader;
 
 import java.util.List;
@@ -34,9 +35,7 @@ import java.util.Locale;
  */
 public class PhoneNumberOfflineGeocoder {
   private static PhoneNumberOfflineGeocoder instance = null;
-  private static final String MAPPING_DATA_DIRECTORY =
-      "/com/android/i18n/phonenumbers/geocoding/data/";
-  private PrefixFileReader prefixFileReader = null;
+  private final PrefixFileReader prefixFileReader;
 
   private final PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
 
@@ -57,7 +56,8 @@ public class PhoneNumberOfflineGeocoder {
   @android.compat.annotation.UnsupportedAppUsage
   public static synchronized PhoneNumberOfflineGeocoder getInstance() {
     if (instance == null) {
-      instance = new PhoneNumberOfflineGeocoder(MAPPING_DATA_DIRECTORY);
+      instance = new PhoneNumberOfflineGeocoder(DefaultMetadataDependenciesProvider.getInstance()
+          .getGeocodingDataDirectory());
     }
     return instance;
   }
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1263_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1263_en
new file mode 100644
index 00000000..04e95159
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1263_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1310_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
index 26fd3041..edb45ee7 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1310_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1468_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1468_en
new file mode 100644
index 00000000..93016187
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1468_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1584_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1584_en
new file mode 100644
index 00000000..41d8570b
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1584_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1656_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1656_en
new file mode 100644
index 00000000..8625c98f
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1656_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1826_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1826_en
new file mode 100644
index 00000000..2eda79af
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1826_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1943_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1943_en
new file mode 100644
index 00000000..6cf5625e
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1943_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1948_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1948_en
new file mode 100644
index 00000000..9577cef8
--- /dev/null
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/1948_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
index 2ae8176b..9a806f96 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
index 9016b0d0..92f3a0ce 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/212_fr
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
index c94e1399..d8b8de7d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/33_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
index 4e81c8af..ced2084e 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
index 3ab2985b..fe9f8a59 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/34_es
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/351_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/351_en
index 61f0da1e..5d925521 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/351_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/351_en
diff --git a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
index b40793e7..0b9330fd 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/44_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
index e51cd55d..e1006cd9 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/54_en b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
index 53245827..a277f96d 100644
--- a/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_en
+++ b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/54_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
index ec254fad..fde61aae 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
index e56bfb93..b5cd9779 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/config b/repackaged/geocoder/src/com/android/i18n/phonenumbers/geocoding/data/config
index 49659897..909cabf3 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
index a2c80e64..aaa5ddfe 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