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

Return empty for empty string in AccessibilityShortcutInfro#loadHtmlDescription

Browse Source 
* Follow the behavior to return empty if given string is empty
	- AccessibilityServiceInfo#loadDescription
	- AccessibilityServiceInfo#loadHtmlDescription
	- AccessibilityShortcutInfo#loadDescription
	- AccessibilityShortcutInfo#loadHtmlDescription

Bug: 154092127
Test: manual test
Change-Id: I77f455945c569c81cb00127a7913bae4db1b3d1c
This commit is contained in:
jasonwshsu
2020-04-20 19:56:27 +08:00
committed by Jason Hsu
parent f8448d1538
commit 066a544d06
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;
}
/**