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: b119e12520 am: 438d3269e3

Browse Source 
Change-Id: I3f32851d8126960eb4d5f0b99bb91be5719ae413
This commit is contained in:
Jason Hsu
2020-04-21 11:25:53 +00:00
committed by Automerger Merge Worker
parent 41a11ed780 438d3269e3
commit 399fecc166
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) {