1 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;
   }