Merge "update setCategories javadoc to include info of its usage in sharing shortcuts"

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/content/pm/ShortcutInfo.java b/core/java/android/content/pm/ShortcutInfo.java
index 5855de1109bd..6a6be75c4606 100644
--- a/core/java/android/content/pm/ShortcutInfo.java
+++ b/core/java/android/content/pm/ShortcutInfo.java
@@ -1214,9 +1214,10 @@ public final class ShortcutInfo implements Parcelable {
         /**
          * Sets categories for a shortcut.
          * <ul>
-         *     <li>Launcher apps may use this information to categorize shortcuts
-         *     <li>Used to filter shortcuts that can handle share intents or actions
-         *         and required for shortcuts that are meant to be used as share targets.
+         * <li>Launcher apps may use this information to categorize shortcuts
+         * <li> Used by the system to associate a published Sharing Shortcut with supported
+         * mimeTypes. Required for published Sharing Shortcuts with a matching category
+         * declared in share targets, defined in the app's manifest linked shortcuts xml file.
          * </ul>
          *
          * @see #SHORTCUT_CATEGORY_CONVERSATION