From 72dfaf89d7f7b48cbd276eea2538213fd97b56ad Mon Sep 17 00:00:00 2001
From: jasonwshsu <jasonwshsu@google.com>
Date: Mon, 20 Apr 2020 12:50:31 +0800
Subject: [PATCH] Allow one of description or htmlDescription attribute
 provided for AccessibilityShortcutInfo

* Only two of them are empty should throw parser error

Bug: 154092127
Test: manual test
Change-Id: I038dbb054f4302b9f5e2c3246fb9539c77533339
---
 .../android/accessibilityservice/AccessibilityShortcutInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
index 9a3dad2eb92f2..6e1d4898f339a 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) {