diff options
| author | 2023-01-20 12:57:51 -0800 | |
|---|---|---|
| committer | 2023-01-20 21:04:55 +0000 | |
| commit | 4f0cd1b00fb6a6d3e2905835bcbae3851bcd524e (patch) | |
| tree | bb14b236c21137ecf1f7ca77d1b7bdae8df5e071 | |
| parent | 324ae340082b8d84f16d6c9e9747f4319ea2bf80 (diff) | |
DO NOT MERGE - Backport master API changes
Backport linter error fixes from a reveal API change in master (see
ag/20832242)
Bug: 259947071
Test: presubmits
Change-Id: I024248b00023baa77fbb6c4e1f5cb7000d1c67db
| -rw-r--r-- | core/java/android/content/Intent.java | 4 | ||||
| -rw-r--r-- | core/java/android/service/chooser/ChooserAction.java | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index a320f1e9509c..3daee1fdd01b 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -5737,7 +5737,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ 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}. @@ -5748,7 +5748,7 @@ public class Intent implements Parcelable, Cloneable { * @hide */ 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 diff --git a/core/java/android/service/chooser/ChooserAction.java b/core/java/android/service/chooser/ChooserAction.java index 3010049633d4..a61b781b6bca 100644 --- a/core/java/android/service/chooser/ChooserAction.java +++ b/core/java/android/service/chooser/ChooserAction.java @@ -27,10 +27,9 @@ import java.util.Objects; /** * 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_PAYLOAD_RESELECTION_ACTION + * @see android.content.Intent#EXTRA_CHOOSER_CUSTOM_ACTIONS * @hide */ public final class ChooserAction implements Parcelable { @@ -88,6 +87,7 @@ public final class ChooserAction implements Parcelable { return "ChooserAction {" + "label=" + mLabel + ", intent=" + mAction + "}"; } + @NonNull public static final Parcelable.Creator<ChooserAction> CREATOR = new Creator<ChooserAction>() { @Override @@ -137,6 +137,7 @@ public final class ChooserAction implements Parcelable { * object. * @return the built action */ + @NonNull public ChooserAction build() { return new ChooserAction(mIcon, mLabel, mAction); } |