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

Commit 670c2ff3 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: 1bd8509d

Change-Id: I25b6f55f92a0e1100e5890986f31cfa527f6dc67
parents 4c0c9351 1bd8509d

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;

    }



    /**