Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Specify two item limit for EXTRA_CHOOSER_TARGETS and EXTRA_INITIAL_INTENTS" am: 73ded9f9df

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

Change-Id: I17ca9c8d0bb5ecad604bd5d2de5cb901ca7aafbd
This commit is contained in:
Amy Gu
2021-12-21 18:26:06 +00:00
committed by Automerger Merge Worker
parent 9b83844f48 73ded9f9df
commit b5f0629d41
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/content/Intent.java
View File

@@ -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 * <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 * 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 * @see #ACTION_CHOOSER
*/ */
@@ -5519,9 +5521,11 @@ public class Intent implements Parcelable, Cloneable {
/** /**
* A Parcelable[] of {@link Intent} or * A Parcelable[] of {@link Intent} or
* {@link android.content.pm.LabeledIntent} objects as set with * {@link android.content.pm.LabeledIntent} objects as set with
* {@link #putExtra(String, Parcelable[])} of additional activities to place * {@link #putExtra(String, Parcelable[])} to place
* a the front of the list of choices, when shown to the user with a * at the front of the list of choices, when shown to the user with an
* {@link #ACTION_CHOOSER}. * {@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"; public static final String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS";