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

Merge "SmsNumberUtils: Remove usage of the following hidden APIs"

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-25 21:40:14 +00:00
committed by Gerrit Code Review
parent d9bcf56448 2863aa48fe
commit 6052ca74cd
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
telephony/common/com/android/internal/telephony/SmsNumberUtils.java
View File

@@ -359,15 +359,41 @@ public class SmsNumberUtils {
return NP_NONE;
}
/**
* This function checks if the passed in string conforms to the NANP format
* i.e. NXX-NXX-XXXX, N is any digit 2-9 and X is any digit 0-9
*/
private static boolean isNANP(String number) {
boolean retVal = false;
if (number.length() == NANP_MEDIUM_LENGTH
|| (number.length() == NANP_LONG_LENGTH && number.startsWith(NANP_NDD))) {
if (number.length() == NANP_LONG_LENGTH) {
number = number.substring(1);
}
return (PhoneNumberUtils.isNanp(number));
if (isTwoToNine(number.charAt(0)) &&
isTwoToNine(number.charAt(3))) {
retVal = true;
for (int i=1; i<NANP_MEDIUM_LENGTH; i++ ) {
char c=number.charAt(i);
if (!PhoneNumberUtils.isISODigit(c)) {
retVal = false;
break;
}
}
}
}
return retVal;
}
private static boolean isTwoToNine (char c) {
if (c >= '2' && c <= '9') {
return true;
} else {
return false;
}
return false;
}
/**
@@ -573,9 +599,9 @@ public class SmsNumberUtils {
int networkType = -1;
int phoneType = telephonyManager.getPhoneType();
if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
networkType = GSM_UMTS_NETWORK;
} else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
} else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
if (isInternationalRoaming(telephonyManager)) {
networkType = CDMA_ROAMING_NETWORK;
} else {