Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I0872f81b1a794e5eaf547499a21d46478b388462
This commit is contained in:
Jason Hsu
2020-04-21 11:25:05 +00:00
committed by Automerger Merge Worker
parent 438d3269e3 8f74622d3b
commit 5c6b6b53c0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
View File

@@ -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;
} }
/** /**