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

Commit 9e0ada13 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Return empty for empty string in... 

Merge "Return empty for empty string in AccessibilityShortcutInfro#loadHtmlDescription" into rvc-dev
parents 61f191f1 066a544d

core/java/android/accessibilityservice/AccessibilityShortcutInfo.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.content.res.XmlResourceParser;

import android.content.res.XmlResourceParser;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.util.Xml;

import android.util.Xml;
@@ -243,7 +242,10 @@ public final class AccessibilityShortcutInfo { 
    public String loadHtmlDescription(@NonNull PackageManager packageManager) {

    public String loadHtmlDescription(@NonNull PackageManager packageManager) {

        final String htmlDescription = loadResourceString(packageManager, mActivityInfo,

        final String htmlDescription = loadResourceString(packageManager, mActivityInfo,

                mHtmlDescriptionRes);

                mHtmlDescriptionRes);

        return TextUtils.isEmpty(htmlDescription) ? null : getFilteredHtmlText(htmlDescription);

        if (htmlDescription != null) {

            return getFilteredHtmlText(htmlDescription);

        }

        return null;

    }

    }





    /**

    /**