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

Commit 8f74622d authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Return empty for empty string in... 

Merge "Return empty for empty string in AccessibilityShortcutInfro#loadHtmlDescription" into rvc-dev am: 9e0ada13

Change-Id: I272073cd3d021bb59a53636520fc7aa0b9dd11a0
parents b119e125 9e0ada13

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;

    }



    /**