diff options
author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-08-31 16:13:53 +0000 |
commit | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (patch) | |
tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/dialer/phonenumberutil | |
parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (diff) |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
Test: make, flash install, run
Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/phonenumberutil')
-rw-r--r-- | java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java index ea4396f02..1189a9b24 100644 --- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java +++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java @@ -24,11 +24,8 @@ import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.TextUtils; import com.android.dialer.common.LogUtil; +import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtilComponent; import com.android.dialer.telecom.TelecomUtil; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber; -import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder; import java.util.Arrays; import java.util.HashSet; import java.util.Locale; @@ -96,43 +93,11 @@ public class PhoneNumberHelper { /** * @return a geographical description string for the specified number. - * @see com.android.i18n.phonenumbers.PhoneNumberOfflineGeocoder */ public static String getGeoDescription(Context context, String number) { - LogUtil.v("PhoneNumberHelper.getGeoDescription", "" + LogUtil.sanitizePii(number)); - - if (TextUtils.isEmpty(number)) { - return null; - } - - PhoneNumberUtil util = PhoneNumberUtil.getInstance(); - PhoneNumberOfflineGeocoder geocoder = PhoneNumberOfflineGeocoder.getInstance(); - - Locale locale = context.getResources().getConfiguration().locale; - String countryIso = getCurrentCountryIso(context, locale); - Phonenumber.PhoneNumber pn = null; - try { - LogUtil.v( - "PhoneNumberHelper.getGeoDescription", - "parsing '" + LogUtil.sanitizePii(number) + "' for countryIso '" + countryIso + "'..."); - pn = util.parse(number, countryIso); - LogUtil.v( - "PhoneNumberHelper.getGeoDescription", "- parsed number: " + LogUtil.sanitizePii(pn)); - } catch (NumberParseException e) { - LogUtil.e( - "PhoneNumberHelper.getGeoDescription", - "getGeoDescription: NumberParseException for incoming number '" - + LogUtil.sanitizePii(number) - + "'"); - } - - if (pn != null) { - String description = geocoder.getDescriptionForNumber(pn, locale); - LogUtil.v("PhoneNumberHelper.getGeoDescription", "- got description: '" + description + "'"); - return description; - } - - return null; + return PhoneNumberGeoUtilComponent.get(context) + .getPhoneNumberGeoUtil() + .getGeoDescription(context, number); } /** @@ -211,10 +176,9 @@ public class PhoneNumberHelper { return number.substring(0, delimiterIndex); } - private static boolean isVerizon(Context context) { // Verizon MCC/MNC codes copied from com/android/voicemailomtp/res/xml/vvm_config.xml. - // TODO: Need a better way to do per carrier and per OEM configurations. + // TODO(sail): Need a better way to do per carrier and per OEM configurations. switch (context.getSystemService(TelephonyManager.class).getSimOperator()) { case "310004": case "310010": |