Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8e6dae8 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I87b992b4b880b50ae46469eba87ccb137b2c4de6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0da89ddc 9a350627

core/java/android/text/util/Linkify.java

+10 −2
Original line number Diff line number Diff line
@@ -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) {