diff --git a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java index 6e1d4898f339a..623734ee5662e 100644 --- a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java @@ -30,7 +30,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.graphics.drawable.Drawable; -import android.text.TextUtils; import android.util.AttributeSet; import android.util.Xml; @@ -243,7 +242,10 @@ public final class AccessibilityShortcutInfo { public String loadHtmlDescription(@NonNull PackageManager packageManager) { final String htmlDescription = loadResourceString(packageManager, mActivityInfo, mHtmlDescriptionRes); - return TextUtils.isEmpty(htmlDescription) ? null : getFilteredHtmlText(htmlDescription); + if (htmlDescription != null) { + return getFilteredHtmlText(htmlDescription); + } + return null; } /**