Merge "EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION -> EXTRA_CHOOSER_MODIFY_SHARE_ACTION"
diff --git a/core/api/current.txt b/core/api/current.txt
index f786e36..2c01eb4 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -10879,7 +10879,7 @@
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 public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";
- field public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION = "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";
+ 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_TARGETS = "android.intent.extra.CHOOSER_TARGETS";
field public static final String EXTRA_CHOSEN_COMPONENT = "android.intent.extra.CHOSEN_COMPONENT";
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index fea5577..5818ed7 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -5919,13 +5919,12 @@
/**
* Optional argument to be used with {@link #ACTION_CHOOSER}.
- * A {@link android.app.PendingIntent} to be sent when the user wants to do payload reselection
- * in the sharesheet.
- * A reselection action allows the user to return to the source app to change the content being
- * shared.
+ * A {@link android.app.PendingIntent} to be sent when the user wants to modify the content that
+ * they're sharing. This can be used to allow the user to return to the source app to, for
+ * example, select different media.
*/
- public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =
- "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";
+ public static final String EXTRA_CHOOSER_MODIFY_SHARE_ACTION =
+ "android.intent.extra.CHOOSER_MODIFY_SHARE_ACTION";
/**
* An {@code ArrayList} of {@code String} annotations describing content for