diff options
| author | Jason Hsu <jasonwshsu@google.com> | 2020-04-21 09:41:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-21 09:41:14 +0000 |
| commit | 61f191f198bdfd4bb07cac3639f31fe82d6765fe (patch) | |
| tree | 9aaa860390db0784d73c928c45db8ee77eef41fa /core/java/android | |
| parent | e0b24a3feede201a5944100a99391f32e5d02a2d (diff) | |
| parent | 72dfaf89d7f7b48cbd276eea2538213fd97b56ad (diff) | |
Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/accessibilityservice/AccessibilityShortcutInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java index 9a3dad2eb92f..6e1d4898f339 100644 --- a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java @@ -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) { |