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

Commit 9001310c authored by Amy Gu's avatar Amy Gu Committed by Automerger Merge Worker
Browse files

Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and... 

Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9 am: b5f0629d am: 379347b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1858069

Change-Id: I9d0089997234826e6310d4fcda14cdf869ec5fdb
parents ecf6241e 379347b2

core/java/android/content/Intent.java

+8 −4
Original line number Diff line number Diff line
@@ -5408,7 +5408,9 @@ public class Intent implements Parcelable, Cloneable { 
     *

     * <p>Targets provided in this way will be presented inline with all other targets provided

     * by services from other apps. They will be prioritized before other service targets, but

     * after those targets provided by sources that the user has manually pinned to the front.</p>

     * after those targets provided by sources that the user has manually pinned to the front.

     * You can provide up to two targets on this extra (the limit of two targets

     * starts in Android 10).</p>

     *

     * @see #ACTION_CHOOSER

     */
@@ -5519,9 +5521,11 @@ public class Intent implements Parcelable, Cloneable { 
    /**

     * A Parcelable[] of {@link Intent} or

     * {@link android.content.pm.LabeledIntent} objects as set with

     * {@link #putExtra(String, Parcelable[])} of additional activities to place

     * a the front of the list of choices, when shown to the user with a

     * {@link #ACTION_CHOOSER}.

     * {@link #putExtra(String, Parcelable[])} to place

     * at the front of the list of choices, when shown to the user with an

     * {@link #ACTION_CHOOSER}. You can choose up to two additional activities

     * to show before the app suggestions (the limit of two additional activities starts in

     * Android 10).

     */

    public static final String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";