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

Commit 744ff314 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Adds EXTRA_METADATA_TEXT field to Intent" into main

parents a806d53a 714ffffd

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11336,6 +11336,7 @@ package android.content { 
    field public static final String EXTRA_LOCALE_LIST = "android.intent.extra.LOCALE_LIST";

    field public static final String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";

    field public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID";

    field @FlaggedApi("android.service.chooser.enable_sharesheet_metadata_extra") public static final String EXTRA_METADATA_TEXT = "android.intent.extra.METADATA_TEXT";

    field public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";

    field public static final String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";

    field public static final String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";

core/java/android/content/Intent.java

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.content; 
import static android.app.sdksandbox.SdkSandboxManager.ACTION_START_SANDBOXED_ACTIVITY;

import static android.content.ContentProvider.maybeAddUserId;

import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE;

import static android.service.chooser.Flags.FLAG_ENABLE_SHARESHEET_METADATA_EXTRA;















import android.Manifest;















import android.accessibilityservice.AccessibilityService;










@@ -6155,6 +6156,17 @@ public class Intent implements Parcelable, Cloneable {













     */















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



























    /**













     * A CharSequence of additional text describing the content being shared. This text will be













     * displayed to the user as a part of the sharesheet when included in an













     * {@link #ACTION_CHOOSER} {@link Intent}.













     *













     * <p>e.g. When sharing a photo, metadata could inform the user that location data is included













     * in the photo they are sharing.</p>













     */













    @FlaggedApi(FLAG_ENABLE_SHARESHEET_METADATA_EXTRA)













    public static final String EXTRA_METADATA_TEXT = "android.intent.extra.METADATA_TEXT";



























    /**















     * A {@link IntentSender} to start after instant app installation success.















     * @hide