From 44382004ce395c4e9c3197bf5d52ca7643304c8d Mon Sep 17 00:00:00 2001 From: govenliu Date: Wed, 29 Jul 2020 12:43:44 +0800 Subject: [WifiTrackerLib] Remove ClickableSpan when helpUriString is empty To prevent unexpected behavior on empty Span, return original string when the helpUriString parameter in linkifyAnnotation is empty. Bug: 161951681 Test: atest com.android.wifitrackerlib.UtilsTest Change-Id: Ib0fd7370a57e833cd04c258c25203a835e5168f1 Merged-In: I9ccb1494d46aca5a4736e9523426941e5599af19 --- libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libs/WifiTrackerLib/src') diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java index 62bbe0f96..d1addede3 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java @@ -696,6 +696,11 @@ class Utils { /** Find the annotation of specified id in rawText and linkify it with helpUriString. */ static CharSequence linkifyAnnotation(Context context, CharSequence rawText, String id, String helpUriString) { + // Return original string when helpUriString is empty. + if (TextUtils.isEmpty(helpUriString)) { + return rawText; + } + SpannableString spannableText = new SpannableString(rawText); Annotation[] annotations = spannableText.getSpans(0, spannableText.length(), Annotation.class); -- cgit v1.2.3