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

Merge "Add static version of getSimCountryIso() called getDefaultSimCountryIso()"

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-15 21:33:30 +00:00
committed by Android (Google) Code Review
parent 46c1b58a89 dc8cb2905e
commit 90982acede
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8567,6 +8567,7 @@ package android.telephony {
method @Deprecated public boolean getDataEnabled();
method @Deprecated public boolean getDataEnabled(int);
method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);
method @NonNull public static String getDefaultSimCountryIso();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();

5
core/java/android/text/util/Linkify.java
View File

@@ -663,11 +663,8 @@ public class Linkify {
private static void gatherTelLinks(ArrayList<LinkSpec> links, Spannable s,
@Nullable Context context) {
PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
final TelephonyManager tm = (context == null)
? TelephonyManager.getDefault()
: TelephonyManager.from(context);
Iterable<PhoneNumberMatch> matches = phoneUtil.findNumbers(s.toString(),
tm.getSimCountryIso().toUpperCase(Locale.US),
TelephonyManager.getDefaultSimCountryIso().toUpperCase(Locale.US),
Leniency.POSSIBLE, Long.MAX_VALUE);
for (PhoneNumberMatch match : matches) {
LinkSpec spec = new LinkSpec();

27
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3573,6 +3573,29 @@ public class TelephonyManager {
return getSimCountryIsoForPhone(getPhoneId());
}
/**
* Returns the ISO-3166 country code equivalent for the SIM provider's country code
* of the default subscription
* <p>
* The ISO-3166 country code is provided in lowercase 2 character format.
* @return the lowercase 2 character ISO-3166 country code, or empty string is not available.
* <p>
* Note: This API is introduced to unblock mainlining work as the following APIs in
* Linkify.java invokes getSimCountryIso() without a context. TODO(Bug 144576376): remove
* this API once the following APIs are redesigned to access telephonymanager with a context.
*
* {@link Linkify#addLinks(@NonNull Spannable text, @LinkifyMask int mask)}
* {@link Linkify#addLinks(@NonNull Spannable text, @LinkifyMask int mask,
@Nullable Function<String, URLSpan> urlSpanFactory)}
*
* @hide
*/
@SystemApi
@NonNull
public static String getDefaultSimCountryIso() {
return getSimCountryIso(SubscriptionManager.getDefaultSubscriptionId());
}
/**
* Returns the ISO country code equivalent for the SIM provider's country code.
*
@@ -3580,7 +3603,7 @@ public class TelephonyManager {
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
public String getSimCountryIso(int subId) {
public static String getSimCountryIso(int subId) {
int phoneId = SubscriptionManager.getPhoneId(subId);
return getSimCountryIsoForPhone(phoneId);
}
@@ -3591,7 +3614,7 @@ public class TelephonyManager {
* @hide
*/
@UnsupportedAppUsage
public String getSimCountryIsoForPhone(int phoneId) {
public static String getSimCountryIsoForPhone(int phoneId) {
return getTelephonyProperty(phoneId, TelephonyProperties.icc_operator_iso_country(), "");
}