Snap for 9618620 from e56827c6e4a075734baff77187250ab340e90f06 to tm-qpr3-release (71649df9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -30978,6 +30978,7 @@ package android.os {
		field public static final int S = 31; // 0x1f
		field public static final int S_V2 = 32; // 0x20
		field public static final int TIRAMISU = 33; // 0x21
		field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710
		}

		public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

+5 −6

Original line number	Diff line number	Diff line
		@@ -5741,14 +5741,13 @@ public class Intent implements Parcelable, Cloneable {

		/**
		* 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.
		* @hide
		*/
		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

+5 −0

Original line number	Diff line number	Diff line
		@@ -1167,6 +1167,11 @@ public class Build {
		* Tiramisu.
		*/
		public static final int TIRAMISU = 33;

		/**
		* Upside Down Cake.
		*/
		public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
		}

		/** The type of build, like "user" or "eng". */

+1 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ class DragResizeInputListener implements AutoCloseable {

		@Override
		public void close() {
		mInputEventReceiver.dispose();
		mInputChannel.dispose();
		try {
		mWindowSession.remove(mFakeWindow);

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ import android.text.TextUtils;
		import android.util.Log;

		import androidx.core.os.BuildCompat;
		import androidx.window.embedding.SplitController;
		import androidx.window.embedding.ActivityEmbeddingController;

		import com.android.settingslib.utils.BuildCompatUtils;

		@@ -86,7 +86,7 @@ public final class ActivityEmbeddingUtils {
		* @param activity Activity that needs the check
		*/
		public static boolean isActivityEmbedded(Activity activity) {
		return SplitController.getInstance().isActivityEmbedded(activity);
		return ActivityEmbeddingController.getInstance(activity).isActivityEmbedded(activity);
		}

		/**