diff options
| -rw-r--r-- | src/com/android/dialer/lookup/ReverseLookupService.java | 9 | ||||
| -rw-r--r-- | src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/dialer/lookup/ReverseLookupService.java b/src/com/android/dialer/lookup/ReverseLookupService.java index 25c3f4a85..fc5a2d741 100644 --- a/src/com/android/dialer/lookup/ReverseLookupService.java +++ b/src/com/android/dialer/lookup/ReverseLookupService.java @@ -62,14 +62,17 @@ public class ReverseLookupService implements PhoneNumberService, Handler.Callbac return; } + String countryIso = mTelephonyManager.getSimCountryIso().toUpperCase(); + String normalizedNumber = phoneNumber != null + ? PhoneNumberUtils.formatNumberToE164(phoneNumber, countryIso) : null; + // Can't do reverse lookup without a number - if (phoneNumber == null) { + if (normalizedNumber == null) { return; } LookupRequest request = new LookupRequest(); - String countryIso = mTelephonyManager.getSimCountryIso().toUpperCase(); - request.normalizedNumber = PhoneNumberUtils.formatNumberToE164(phoneNumber, countryIso); + request.normalizedNumber = normalizedNumber; request.formattedNumber = PhoneNumberUtils.formatNumber(phoneNumber, request.normalizedNumber, GeoUtil.getCurrentCountryIso(mContext)); request.numberListener = numberListener; diff --git a/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java b/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java index 9dafab785..649be108b 100644 --- a/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java +++ b/src/com/android/dialer/lookup/opencnam/OpenCnamReverseLookup.java @@ -57,7 +57,7 @@ public class OpenCnamReverseLookup extends ReverseLookup { */ public ContactInfo lookupNumber(Context context, String normalizedNumber, String formattedNumber) throws IOException { - if (normalizedNumber.startsWith("+") &&!normalizedNumber.startsWith("+1")) { + if (normalizedNumber.startsWith("+") && !normalizedNumber.startsWith("+1")) { // Any non-US number will return "We currently accept only US numbers" return null; } |