Adds EXTRA_METADATA_TEXT field to Intent This change is guarded by android.service.chooser.Flags.FLAG_ENABLE_SHARESHEET_METADATA_EXTRA. Test: existing tests pass BUG: 318942069 BUG: 324573482 Change-Id: Ice62c69c0e1a09fc545d8ee3a7340c58b87a2ae9
diff --git a/core/api/current.txt b/core/api/current.txt index 321d35d..b676d43 100644 --- a/core/api/current.txt +++ b/core/api/current.txt
@@ -11309,6 +11309,7 @@ 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";
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 08871d4..333c363 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java
@@ -19,6 +19,7 @@ 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; @@ -6156,6 +6157,17 @@ 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 */
diff --git a/core/java/android/service/chooser/flags.aconfig b/core/java/android/service/chooser/flags.aconfig index 3cc7f5a..79c94e3 100644 --- a/core/java/android/service/chooser/flags.aconfig +++ b/core/java/android/service/chooser/flags.aconfig
@@ -8,6 +8,13 @@ } flag { + name: "enable_sharesheet_metadata_extra" + namespace: "intentresolver" + description: "This flag enables sharesheet metadata to be displayed to users." + bug: "318942069" +} + +flag { name: "support_nfc_resolver" namespace: "systemui" description: "This flag controls the new NFC 'resolver' activity"