Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE - Backport master API changes am: 4f0cd1b00f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21061524

Change-Id: Ib1b6c88ffce0e607cf8d548128ad5521fb9cb8d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrey Epin
2023-01-23 19:28:12 +00:00
committed by Automerger Merge Worker
parent 7e62e4aff6 4f0cd1b00f
commit f57a036c9f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/Intent.java
View File

@@ -5737,7 +5737,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide * @hide
*/ */
public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS = public static final String EXTRA_CHOOSER_CUSTOM_ACTIONS =
"android.intent.extra.EXTRA_CHOOSER_CUSTOM_ACTIONS"; "android.intent.extra.CHOOSER_CUSTOM_ACTIONS";
/** /**
* Optional argument to be used with {@link #ACTION_CHOOSER}. * Optional argument to be used with {@link #ACTION_CHOOSER}.
@@ -5748,7 +5748,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide * @hide
*/ */
public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION = public static final String EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION =
"android.intent.extra.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION"; "android.intent.extra.CHOOSER_PAYLOAD_RESELECTION_ACTION";
/** /**
* An {@code ArrayList} of {@code String} annotations describing content for * An {@code ArrayList} of {@code String} annotations describing content for

7
core/java/android/service/chooser/ChooserAction.java
View File

@@ -27,10 +27,9 @@ import java.util.Objects;
/** /**
* A ChooserAction is an app-defined action that can be provided to the Android Sharesheet to * A ChooserAction is an app-defined action that can be provided to the Android Sharesheet to
* be shown to the user when {@link android.content.Intent.ACTION_CHOOSER} is invoked. * be shown to the user when {@link android.content.Intent#ACTION_CHOOSER} is invoked.
* *
* @see android.content.Intent.EXTRA_CHOOSER_CUSTOM_ACTIONS * @see android.content.Intent#EXTRA_CHOOSER_CUSTOM_ACTIONS
* @see android.content.Intent.EXTRA_CHOOSER_PAYLOAD_RESELECTION_ACTION
* @hide * @hide
*/ */
public final class ChooserAction implements Parcelable { public final class ChooserAction implements Parcelable {
@@ -88,6 +87,7 @@ public final class ChooserAction implements Parcelable {
return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}"; return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}";
} }
@NonNull
public static final Parcelable.Creator<ChooserAction> CREATOR = public static final Parcelable.Creator<ChooserAction> CREATOR =
new Creator<ChooserAction>() { new Creator<ChooserAction>() {
@Override @Override
@@ -137,6 +137,7 @@ public final class ChooserAction implements Parcelable {
* object. * object.
* @return the built action * @return the built action
*/ */
@NonNull
public ChooserAction build() { public ChooserAction build() {
return new ChooserAction(mIcon, mLabel, mAction); return new ChooserAction(mIcon, mLabel, mAction);
} }