Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new phone number match method." am: 096b7d4a25 am: 84725a8e42

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I603146e150d28d9b57619ec75e124068dadbb780
This commit is contained in:
Grace Jia
2021-01-14 23:50:10 +00:00
committed by Automerger Merge Worker
parent 4a81036783 84725a8e42
commit 24bfc6b027
2 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -40497,12 +40497,13 @@ package android.telephony {
public class PhoneNumberUtils {
ctor public PhoneNumberUtils();
method public static void addTtsSpan(android.text.Spannable, int, int);
method public static boolean areSamePhoneNumber(@NonNull String, @NonNull String, @NonNull String);
method @Deprecated public static String calledPartyBCDFragmentToString(byte[], int, int);
method public static String calledPartyBCDFragmentToString(byte[], int, int, int);
method @Deprecated public static String calledPartyBCDToString(byte[], int, int);
method public static String calledPartyBCDToString(byte[], int, int, int);
method public static boolean compare(String, String);
method public static boolean compare(android.content.Context, String, String);
method @Deprecated public static boolean compare(String, String);
method @Deprecated public static boolean compare(android.content.Context, String, String);
method public static String convertKeypadLettersToDigits(String);
method public static android.text.style.TtsSpan createTtsSpan(String);
method public static CharSequence createTtsSpannable(CharSequence);

49
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -478,7 +478,9 @@ public class PhoneNumberUtils {
/**
* Compare phone numbers a and b, return true if they're identical enough for caller ID purposes.
* @deprecated use {@link #areSamePhoneNumber(String, String, String)} instead
*/
@Deprecated
public static boolean compare(String a, String b) {
// We've used loose comparation at least Eclair, which may change in the future.
@@ -489,7 +491,9 @@ public class PhoneNumberUtils {
* Compare phone numbers a and b, and return true if they're identical
* enough for caller ID purposes. Checks a resource to determine whether
* to use a strict or loose comparison algorithm.
* @deprecated use {@link #areSamePhoneNumber(String, String, String)} instead
*/
@Deprecated
public static boolean compare(Context context, String a, String b) {
boolean useStrict = context.getResources().getBoolean(
com.android.internal.R.bool.config_use_strict_phone_number_comparation);
@@ -3218,7 +3222,7 @@ public class PhoneNumberUtils {
}
// The conversion map is not defined (this is default). Skip conversion.
if (sConvertToEmergencyMap == null || sConvertToEmergencyMap.length == 0 ) {
if (sConvertToEmergencyMap == null || sConvertToEmergencyMap.length == 0) {
return number;
}
@@ -3254,4 +3258,47 @@ public class PhoneNumberUtils {
}
return number;
}
/**
* Determines if two phone numbers are the same.
* <p>
* Matching is based on <a href="https://github.com/google/libphonenumber>libphonenumber</a>.
* Unlike {@link #compare(String, String)}, matching takes into account national
* dialing plans rather than simply matching the last 7 digits of the two phone numbers. As a
* result, it is expected that some numbers which would match using the previous method will no
* longer match using this new approach.
*
* @param number1
* @param number2
* @param defaultCountryIso The lowercase two letter ISO 3166-1 country code. Used when parsing
* the phone numbers where it is not possible to determine the country
* associated with a phone number based on the number alone. It
* is recommended to pass in
* {@link TelephonyManager#getNetworkCountryIso()}.
* @return True if the two given phone number are same.
*/
public static boolean areSamePhoneNumber(@NonNull String number1,
@NonNull String number2, @NonNull String defaultCountryIso) {
PhoneNumberUtil util = PhoneNumberUtil.getInstance();
PhoneNumber n1;
PhoneNumber n2;
defaultCountryIso = defaultCountryIso.toUpperCase();
try {
n1 = util.parseAndKeepRawInput(number1, defaultCountryIso);
n2 = util.parseAndKeepRawInput(number2, defaultCountryIso);
} catch (NumberParseException e) {
return false;
}
PhoneNumberUtil.MatchType matchType = util.isNumberMatch(n1, n2);
if (matchType == PhoneNumberUtil.MatchType.EXACT_MATCH
|| matchType == PhoneNumberUtil.MatchType.NSN_MATCH) {
return true;
} else if (matchType == PhoneNumberUtil.MatchType.SHORT_NSN_MATCH) {
return (n1.getNationalNumber() == n2.getNationalNumber()
&& n1.getCountryCode() == n2.getCountryCode());
} else {
return false;
}
}
}