Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c0c9351 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Allow one of description or htmlDescription attribute provided for... 

Merge "Allow one of description or htmlDescription attribute provided for AccessibilityShortcutInfo" into rvc-dev am: 61f191f1 am: 8b76ed3c

Change-Id: I882ded20205146141c776b402ce74e11c8a16fef
parents d179dba2 8b76ed3c

core/java/android/accessibilityservice/AccessibilityShortcutInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {