Merge "Improve ShortcutSrvice" into nyc-dev am: 45c1827

am: 706928d

* commit '706928df5d361e15623108a8f47fae28cad5a9d7':
  Improve ShortcutSrvice

core/java/android/content/pm/LauncherApps.java

@@ -160,7 +160,8 @@ public class LauncherApps {
          * as defined in {@link #hasShortcutHostPermission()}, will receive it.
          *
          * @param packageName The name of the package that has the shortcuts.
-         * @param shortcuts all shortcuts from the package (dynamic and/or pinned).
+         * @param shortcuts all shortcuts from the package (dynamic and/or pinned).  Only "key"
+         *    information will be provided, as defined in {@link ShortcutInfo#hasKeyFieldsOnly()}.
          * @param user The UserHandle of the profile that generated the change.
          */
         public void onShortcutsChanged(@NonNull String packageName,

core/java/android/content/pm/ShortcutInfo.java

@@ -46,8 +46,6 @@ import java.lang.annotation.RetentionPolicy;
  *   if necessary, and persisted.
  *
  *   We will disallow byte[] icons, because they can easily go over binder size limit.
- *
- * TODO Move save/load to this class
  */
 public class ShortcutInfo implements Parcelable {
     /* @hide */