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

Browse Source 
Change-Id: I8914aa9f096c4d38a73aa81d41c14f94d0640cb3
This commit is contained in:
Jason Hsu
2020-04-21 11:16:20 +00:00
committed by Automerger Merge Worker
parent f2337a33fc 61f191f198
commit b119e12520
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); com.android.internal.R.styleable.AccessibilityShortcutTarget_settingsActivity);
asAttributes.recycle(); asAttributes.recycle();
if (mDescriptionResId == 0 || mSummaryResId == 0) { if ((mDescriptionResId == 0 && mHtmlDescriptionRes == 0) || mSummaryResId == 0) {
throw new XmlPullParserException("No description or summary in meta-data"); throw new XmlPullParserException("No description or summary in meta-data");
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {