Merge "Remove FLAG_ENABLE_CHOOSER_RESULT" into main (a8cd8b7c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -11481,8 +11481,8 @@ package android.content {
		field @FlaggedApi("android.service.chooser.chooser_payload_toggling") public static final String EXTRA_CHOOSER_FOCUSED_ITEM_POSITION = "android.intent.extra.CHOOSER_FOCUSED_ITEM_POSITION";
		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 @FlaggedApi("android.service.chooser.enable_chooser_result") public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT";
		field @FlaggedApi("android.service.chooser.enable_chooser_result") public static final String EXTRA_CHOOSER_RESULT_INTENT_SENDER = "android.intent.extra.CHOOSER_RESULT_INTENT_SENDER";
		field public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT";
		field public static final String EXTRA_CHOOSER_RESULT_INTENT_SENDER = "android.intent.extra.CHOOSER_RESULT_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";
		field public static final String EXTRA_CHOSEN_COMPONENT_INTENT_SENDER = "android.intent.extra.CHOSEN_COMPONENT_INTENT_SENDER";
		@@ -40653,7 +40653,7 @@ package android.service.chooser {
		method @NonNull public android.service.chooser.ChooserAction build();
		}

		@FlaggedApi("android.service.chooser.enable_chooser_result") public final class ChooserResult implements android.os.Parcelable {
		public final class ChooserResult implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.content.ComponentName getSelectedComponent();
		method public int getType();

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -3123,7 +3123,7 @@ package android.service.autofill.augmented {

		package android.service.chooser {

		@FlaggedApi("android.service.chooser.enable_chooser_result") public final class ChooserResult implements android.os.Parcelable {
		public final class ChooserResult implements android.os.Parcelable {
		ctor public ChooserResult(int, @Nullable android.content.ComponentName, boolean);
		}

core/java/android/content/Intent.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -1064,11 +1064,7 @@ public class Intent implements Parcelable, Cloneable {
		}

		if (sender != null) {
		if (android.service.chooser.Flags.enableChooserResult()) {
		intent.putExtra(EXTRA_CHOOSER_RESULT_INTENT_SENDER, sender);
		} else {
		intent.putExtra(EXTRA_CHOSEN_COMPONENT_INTENT_SENDER, sender);
		}
		}

		// Migrate any clip data and flags from target.
		@@ -6425,7 +6421,6 @@ public class Intent implements Parcelable, Cloneable {
		* activity. The IntentSender will have the extra {@link #EXTRA_CHOOSER_RESULT} describing
		* the result.
		*/
		@FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT)
		public static final String EXTRA_CHOOSER_RESULT_INTENT_SENDER =
		"android.intent.extra.CHOOSER_RESULT_INTENT_SENDER";

		@@ -6435,7 +6430,6 @@ public class Intent implements Parcelable, Cloneable {
		* An instance is supplied to the optional IntentSender provided to
		* {@link #createChooser(Intent, CharSequence, IntentSender)} when the session completes.
		*/
		@FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT)
		public static final String EXTRA_CHOOSER_RESULT = "android.intent.extra.CHOOSER_RESULT";

		/**

core/java/android/service/chooser/ChooserResult.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package android.service.chooser;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -41,7 +40,6 @@ import java.util.Objects;
		*
		* @see Intent#EXTRA_CHOOSER_RESULT_INTENT_SENDER
		*/
		@FlaggedApi(android.service.chooser.Flags.FLAG_ENABLE_CHOOSER_RESULT)
		public final class ChooserResult implements Parcelable {

		/**