diff options
Diffstat (limited to 'java/com/android/dialer/phonenumbergeoutil')
3 files changed, 4 insertions, 5 deletions
diff --git a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java index 2005abc68..7e4559828 100644 --- a/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java +++ b/java/com/android/dialer/phonenumbergeoutil/PhoneNumberGeoUtil.java @@ -20,5 +20,6 @@ import android.content.Context; /** Interface for getting geo information for phone number. */ public interface PhoneNumberGeoUtil { - String getGeoDescription(Context context, String number); + /** Returns geo location information for a phone number, e.g. California. */ + String getGeoDescription(Context context, String number, String countryIso); } diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java index 32f65927d..fb28ed588 100644 --- a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java +++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilImpl.java @@ -21,7 +21,6 @@ import android.text.TextUtils; import com.android.dialer.common.LogUtil; import com.android.dialer.compat.CompatUtils; import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; -import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; @@ -36,7 +35,7 @@ public class PhoneNumberGeoUtilImpl implements PhoneNumberGeoUtil { public PhoneNumberGeoUtilImpl() {} @Override - public String getGeoDescription(Context context, String number) { + public String getGeoDescription(Context context, String number, String countryIso) { LogUtil.v("PhoneNumberGeoUtilImpl.getGeoDescription", "" + LogUtil.sanitizePii(number)); if (TextUtils.isEmpty(number)) { @@ -47,7 +46,6 @@ public class PhoneNumberGeoUtilImpl implements PhoneNumberGeoUtil { PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance(); Locale locale = CompatUtils.getLocale(context); - String countryIso = PhoneNumberHelper.getCurrentCountryIso(context, locale); Phonenumber.PhoneNumber pn = null; try { LogUtil.v( diff --git a/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java index 4c5b3b0b3..06cd13760 100644 --- a/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java +++ b/java/com/android/dialer/phonenumbergeoutil/stub/PhoneNumberGeoUtilStub.java @@ -26,7 +26,7 @@ public final class PhoneNumberGeoUtilStub implements PhoneNumberGeoUtil { public PhoneNumberGeoUtilStub() {} @Override - public String getGeoDescription(Context context, String number) { + public String getGeoDescription(Context context, String number, String countryIso) { return null; } } |