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

Commit f57a036c authored by Andrey Epin's avatar Andrey Epin Committed by Automerger Merge Worker
Browse files

DO NOT MERGE - Backport master API changes am: 4f0cd1b0 

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



Change-Id: Ib1b6c88ffce0e607cf8d548128ad5521fb9cb8d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e62e4af 4f0cd1b0

core/java/android/content/Intent.java

+2 −2
Original line number Diff line number Diff line
@@ -5737,7 +5737,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS =

            "android.intent.extra.EXTRA_CHOOSER_CUSTOM_ACTIONS";

            "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";



    /**

     * Optional argument to be used with {@link #ACTION_CHOOSER}.
@@ -5748,7 +5748,7 @@ public class Intent implements Parcelable, Cloneable { 
     * @hide

     */

    public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =

            "android.intent.extra.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION";

            "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";



    /**

     * An {@code ArrayList} of {@code String} annotations describing content for

core/java/android/service/chooser/ChooserAction.java

+4 −3
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ import java.util.Objects; 


/**

 * A ChooserAction is an app-defined action that can be provided to the Android Sharesheet to

 * be shown to the user when {@link android.content.Intent.ACTION_CHOOSER} is invoked.

 * be shown to the user when {@link android.content.Intent#ACTION_CHOOSER} is invoked.

 *

 * @see android.content.Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS

 * @see android.content.Intent.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION

 * @see android.content.Intent#EXTRA_CHOOSER_CUSTOM_ACTIONS

 * @hide

 */

public final class ChooserAction implements Parcelable {
@@ -88,6 +87,7 @@ public final class ChooserAction implements Parcelable { 
        return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}";

    }



    @NonNull

    public static final Parcelable.Creator<ChooserAction> CREATOR =

            new Creator<ChooserAction>() {

                @Override
@@ -137,6 +137,7 @@ public final class ChooserAction implements Parcelable { 
         * object.

         * @return the built action

         */

        @NonNull

        public ChooserAction build() {

            return new ChooserAction(mIcon, mLabel, mAction);

        }