diff options
| author | 2024-06-26 17:10:45 +0000 | |
|---|---|---|
| committer | 2024-06-26 19:51:47 +0000 | |
| commit | dccc1ebad7df378001391429a189e74d07b38b26 (patch) | |
| tree | 793c55ca954d47771b364bb34fafdb59146a0cf8 | |
| parent | 5812079c51fd834225be0f3956645d6b32665046 (diff) | |
Remove enable_sharesheet_metadata_extra
Test: atest CtsSharesheetDeviceTest
Bug: 318942069
Flag: android.service.chooser.enable_sharesheet_metadata_extra
Change-Id: Ib5c16128b9b72af2af3e94ea861977cabc251221
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 2 | ||||
| -rw-r--r-- | core/java/android/service/chooser/flags.aconfig | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 44a6c6b2803b..032283a00475 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 112507e00e85..97404dcdea0c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -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"; /** diff --git a/core/java/android/service/chooser/flags.aconfig b/core/java/android/service/chooser/flags.aconfig index 82c16138f967..1f1a35117f72 100644 --- a/core/java/android/service/chooser/flags.aconfig +++ b/core/java/android/service/chooser/flags.aconfig @@ -2,14 +2,6 @@ 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 namespace: "intentresolver" |