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

Commit a3c9b6ee 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 am: 8f74622d am: 5c6b6b53

Change-Id: I9d7bf5be116fbb46d55be387860d335ddd1477e8
parents 399fecc1 5c6b6b53

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;

    }



    /**