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: 1bd8509d0c

Browse Source 
Change-Id: I25b6f55f92a0e1100e5890986f31cfa527f6dc67
This commit is contained in:
Jason Hsu
2020-04-21 09:58:31 +00:00
committed by Automerger Merge Worker
parent 4c0c9351b4 1bd8509d0c
commit 670c2ff34c
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.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;
}
/**