Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev

2020-04-21 09:41:14 +00:00
parent e0b24a3fee 72dfaf89d7
commit 61f191f198
1 changed files with 1 additions and 1 deletions
--- 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) {