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

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

Merge "Remove enable_sharesheet_metadata_extra" into main

parents e4704338 dccc1eba

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11394,7 +11394,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_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

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.sdksandbox.SdkSandboxManager.ACTION_START_SANDBOXED_AC 
import static android.content.ContentProvider.maybeAddUserId;

import static android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE;

import static android.security.Flags.FLAG_FRP_ENFORCEMENT;

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















import android.Manifest;















import android.accessibilityservice.AccessibilityService;










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













     * <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";





























    /**

































core/java/android/service/chooser/flags.aconfig



+0
−8




























Original line number
Diff line number
Diff line















package: "android.service.chooser"















container: "system"





























flag {













    name: "enable_sharesheet_metadata_extra"













    is_exported: true













    namespace: "intentresolver"













    description: "This flag enables sharesheet metadata to be displayed to users."













    bug: "318942069"













}





























flag {















  name: "chooser_payload_toggling"















  is_exported: true