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

Commit 066a544d authored by jasonwshsu's avatar jasonwshsu Committed by Jason Hsu
Browse files

Return empty for empty string in AccessibilityShortcutInfro#loadHtmlDescription 

* Follow the behavior to return empty if given string is empty
	- AccessibilityServiceInfo#loadDescription
	- AccessibilityServiceInfo#loadHtmlDescription
	- AccessibilityShortcutInfo#loadDescription
	- AccessibilityShortcutInfo#loadHtmlDescription

Bug: 154092127
Test: manual test
Change-Id: I77f455945c569c81cb00127a7913bae4db1b3d1c
parent f8448d15

core/java/android/accessibilityservice/AccessibilityShortcutInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -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;

    }



    /**