Merge cherrypicks of ['googleplex-android-review.googlesource.com/24308899',... (6e47c707) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -454,12 +454,11 @@ public class Dialog implements DialogInterface, Window.Callback,
		*/
		protected void onStart() {
		if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(true);
		if (mContext != null
		if (allowsRegisterDefaultOnBackInvokedCallback() && mContext != null
		&& WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
		// Add onBackPressed as default back behavior.
		mDefaultBackCallback = this::onBackPressed;
		getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
		mDefaultBackCallback = null;
		}
		}

		@@ -470,9 +469,18 @@ public class Dialog implements DialogInterface, Window.Callback,
		if (mActionBar != null) mActionBar.setShowHideAnimationEnabled(false);
		if (mDefaultBackCallback != null) {
		getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mDefaultBackCallback);
		mDefaultBackCallback = null;
		}
		}

		/**
		* Whether this dialog allows to register the default onBackInvokedCallback.
		* @hide
		*/
		protected boolean allowsRegisterDefaultOnBackInvokedCallback() {
		return true;
		}

		private static final String DIALOG_SHOWING_TAG = "android:dialogShowing";
		private static final String DIALOG_HIERARCHY_TAG = "android:dialogHierarchy";

		@@ -697,7 +705,8 @@ public class Dialog implements DialogInterface, Window.Callback,
		if ((keyCode == KeyEvent.KEYCODE_BACK \|\| keyCode == KeyEvent.KEYCODE_ESCAPE)
		&& event.isTracking()
		&& !event.isCanceled()
		&& !WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)) {
		&& (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(mContext)
		\|\| !allowsRegisterDefaultOnBackInvokedCallback())) {
		onBackPressed();
		return true;
		}

core/java/android/app/Notification.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -3485,8 +3485,11 @@ public class Notification implements Parcelable
		*
		* @hide
		*/
		public void setAllowlistToken(@Nullable IBinder token) {
		mAllowlistToken = token;
		public void clearAllowlistToken() {
		mAllowlistToken = null;
		if (publicVersion != null) {
		publicVersion.clearAllowlistToken();
		}
		}

		/**

core/java/android/content/AttributionSource.java

+24 −7

Original line number	Diff line number	Diff line
		@@ -211,6 +211,11 @@ public final class AttributionSource implements Parcelable {
		token, mAttributionSourceState.renouncedPermissions, getNext());
		}

		/** @hide */
		public AttributionSource withDefaultToken() {
		return withToken(sDefaultToken);
		}

		/** @hide */
		public AttributionSource withPid(int pid) {
		return new AttributionSource(getUid(), pid, getPackageName(), getAttributionTag(),
		@@ -520,16 +525,28 @@ public final class AttributionSource implements Parcelable {
		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		AttributionSource that = (AttributionSource) o;
		return mAttributionSourceState.uid == that.mAttributionSourceState.uid
		return equalsExceptToken(that) && Objects.equals(
		mAttributionSourceState.token, that.mAttributionSourceState.token);
		}

		/**
		* We store trusted attribution sources without their token (the token is the key to the map)
		* to avoid having a strong reference to the token. This means, when checking the equality of a
		* supplied AttributionSource in PermissionManagerService.isTrustedAttributionSource, we want to
		* compare everything except the token.
		*
		* @hide
		*/
		public boolean equalsExceptToken(@Nullable AttributionSource o) {
		if (o == null) return false;
		return mAttributionSourceState.uid == o.mAttributionSourceState.uid
		&& Objects.equals(mAttributionSourceState.packageName,
		that.mAttributionSourceState.packageName)
		o.mAttributionSourceState.packageName)
		&& Objects.equals(mAttributionSourceState.attributionTag,
		that.mAttributionSourceState.attributionTag)
		&& Objects.equals(mAttributionSourceState.token,
		that.mAttributionSourceState.token)
		o.mAttributionSourceState.attributionTag)
		&& Arrays.equals(mAttributionSourceState.renouncedPermissions,
		that.mAttributionSourceState.renouncedPermissions)
		&& Objects.equals(getNext(), that.getNext());
		o.mAttributionSourceState.renouncedPermissions)
		&& Objects.equals(getNext(), o.getNext());
		}

		@Override

core/java/android/hardware/usb/UsbConfiguration.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,8 @@ public class UsbConfiguration implements Parcelable {
		String name = in.readString();
		int attributes = in.readInt();
		int maxPower = in.readInt();
		Parcelable[] interfaces = in.readParcelableArray(UsbInterface.class.getClassLoader());
		Parcelable[] interfaces = in.readParcelableArray(
		UsbInterface.class.getClassLoader(), UsbInterface.class);
		UsbConfiguration configuration = new UsbConfiguration(id, name, attributes, maxPower);
		configuration.setInterfaces(interfaces);
		return configuration;

core/java/android/inputmethodservice/SoftInputWindow.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,13 @@ final class SoftInputWindow extends Dialog {
		@WindowState
		private int mWindowState = WindowState.TOKEN_PENDING;

		@Override
		protected boolean allowsRegisterDefaultOnBackInvokedCallback() {
		// Do not register OnBackInvokedCallback from Dialog#onStart, InputMethodService will
		// register CompatOnBackInvokedCallback for input method window.
		return false;
		}

		/**
		* Set {@link IBinder} window token to the window.
		*