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

Merge "Change Linkify to use defaultCountry if simCountryIso is empty." am: 9a35062714

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

Change-Id: I87b992b4b880b50ae46469eba87ccb137b2c4de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aishwarya Mallampati
2023-05-30 20:41:27 +00:00
committed by Automerger Merge Worker
parent 0da89ddcea 9a35062714
commit f8e6dae80b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.text.style.URLSpan;
import android.text.TextUtils;
import android.util.Log;
import android.util.Patterns;
import android.webkit.WebView;
@@ -672,8 +673,15 @@ public class Linkify {
@Nullable Context context) {
PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
final Context ctx = (context != null) ? context : ActivityThread.currentApplication();
final String regionCode = (ctx != null) ? ctx.getSystemService(TelephonyManager.class).
getSimCountryIso().toUpperCase(Locale.US) : Locale.getDefault().getCountry();
String regionCode = Locale.getDefault().getCountry();
if (ctx != null) {
String simCountryIso = ctx.getSystemService(TelephonyManager.class).getSimCountryIso();
if (!TextUtils.isEmpty(simCountryIso)) {
// Assign simCountryIso if it is available
regionCode = simCountryIso.toUpperCase(Locale.US);
}
}
Iterable<PhoneNumberMatch> matches = phoneUtil.findNumbers(s.toString(),
regionCode, Leniency.POSSIBLE, Long.MAX_VALUE);
for (PhoneNumberMatch match : matches) {