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

Commit 9d02f16a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove android.service.chooser.chooser_payload_toggling flag" into main

parents 5e3b033c c0442c1c

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -11485,10 +11485,10 @@ package android.content { 
    field public static final String EXTRA_CHANGED_COMPONENT_NAME_LIST = "android.intent.extra.changed_component_name_list";

    field public static final String EXTRA_CHANGED_PACKAGE_LIST = "android.intent.extra.changed_package_list";

    field public static final String EXTRA_CHANGED_UID_LIST = "android.intent.extra.changed_uid_list";

    field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI";

    field public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI";

    field public static final String EXTRA_CHOOSER_CONTENT_TYPE_HINT = "android.intent.extra.CHOOSER_CONTENT_TYPE_HINT";

    field public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";

    field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION";

    field public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION";

    field public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION = "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";

    field public static final String EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER = "android.intent.extra.CHOOSER_REFINEMENT_INTENT_SENDER";

    field public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT";
@@ -40755,7 +40755,7 @@ package android.service.carrier { 














package android.service.chooser {



























  @FlaggedApi("android.service.chooser.chooser_payload_toggling") public interface AdditionalContentContract {













  public interface AdditionalContentContract {















  }





























  public static interface AdditionalContentContract.Columns {

























core/java/android/content/Intent.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -6184,7 +6184,6 @@ public class Intent implements Parcelable, Cloneable {













     * {@link #EXTRA_CHOOSER_RESULT_INTENT_SENDER}.















     * </p>















     */













    @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING)















    public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI =















            "android.intent.extra.CHOOSER_ADDITIONAL_CONTENT_URI";























@@ -6194,7 +6193,6 @@ public class Intent implements Parcelable, Cloneable {













     * An integer, zero-based index into {@link #EXTRA_STREAM} argument indicating the item that















     * should be focused by the Chooser in preview.















     */













    @FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING)















    public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION =















            "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION";















































core/java/android/service/chooser/AdditionalContentContract.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -16,13 +16,10 @@





























package android.service.chooser;





























import android.annotation.FlaggedApi;





























/**















 * Specifies constants used by Chooser when interacting with the additional content provider,















 * see {@link android.content.Intent#EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI}.















 */













@FlaggedApi(android.service.chooser.Flags.FLAG_CHOOSER_PAYLOAD_TOGGLING)















public interface AdditionalContentContract {































    interface Columns {