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

Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev am: 61f191f198 am: 8b76ed3ce0 am: 4c0c9351b4

Browse Source 
Change-Id: Iaaa4d25a0ddd159a500d37784fabec49a0062302
This commit is contained in:
Jason Hsu
2020-04-21 10:18:44 +00:00
committed by Automerger Merge Worker
parent 278a50a2db 4c0c9351b4
commit 8fb143ef20
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,7 +153,7 @@ public final class AccessibilityShortcutInfo {
com.android.internal.R.styleable.AccessibilityShortcutTarget_settingsActivity);
asAttributes.recycle();
if (mDescriptionResId == 0 || mSummaryResId == 0) {
if ((mDescriptionResId == 0 && mHtmlDescriptionRes == 0) || mSummaryResId == 0) {
throw new XmlPullParserException("No description or summary in meta-data");
}
} catch (PackageManager.NameNotFoundException e) {