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

Commit ede00d2f authored by Aashna Jena's avatar Aashna Jena Committed by Automerger Merge Worker
Browse files

Merge "Update IANA_TOP_LEVEL_DOMAINS in accordance with... 

Merge "Update IANA_TOP_LEVEL_DOMAINS in accordance with http://data.iana.org/TLD/tlds-alpha-by-domain.txt" into main am: da2c2d18 am: bec3b157 am: 4bc9d4d4

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



Change-Id: I1db9bdb573abc623136d56b72b8bae3bbf014580
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4636c2f 4bc9d4d4

core/java/android/util/Patterns.java

+158 −112

File changed.

Preview size limit exceeded, changes collapsed.

core/tests/coretests/src/android/util/PatternsTest.java

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ public class PatternsTest extends TestCase { 
    @SmallTest

    public void testAutoLinkWebUrl_doesNotMatchUrlsWithoutProtocolAndWithUnknownTld()

            throws Exception {

        String url = "thank.you";

        String url = "thank.unknowntld";

        assertFalse("Should not match URL that does not start with a protocol and " +

                "does not contain a known TLD",

                Patterns.AUTOLINK_WEB_URL.matcher(url).matches());
@@ -422,7 +422,7 @@ public class PatternsTest extends TestCase { 
    @SmallTest

    public void testAutoLinkWebUrl_doesNotMatchUrlsWithEmojiWithoutProtocolAndWithoutKnownTld()

            throws Exception {

        String url = "Thank\u263A.you";

        String url = "Thank\u263A.unknowntld";

        assertFalse("Should not match URLs containing emoji and with unknown TLD",

                Patterns.AUTOLINK_WEB_URL.matcher(url).matches());

    }