Merge "Clean up predictive_back_system_override_callback flag(1/2)" into main (8efc4a06) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -63587,9 +63587,9 @@ package android.window {
		method public void markSyncReady();
		}

		@FlaggedApi("com.android.window.flags.predictive_back_system_override_callback") public final class SystemOnBackInvokedCallbacks {
		method @FlaggedApi("com.android.window.flags.predictive_back_system_override_callback") @NonNull public static android.window.OnBackInvokedCallback finishAndRemoveTaskCallback(@NonNull android.app.Activity);
		method @FlaggedApi("com.android.window.flags.predictive_back_system_override_callback") @NonNull public static android.window.OnBackInvokedCallback moveTaskToBackCallback(@NonNull android.app.Activity);
		public final class SystemOnBackInvokedCallbacks {
		method @NonNull public static android.window.OnBackInvokedCallback finishAndRemoveTaskCallback(@NonNull android.app.Activity);
		method @NonNull public static android.window.OnBackInvokedCallback moveTaskToBackCallback(@NonNull android.app.Activity);
		}

		public final class TrustedPresentationThresholds implements android.os.Parcelable {

+0 −6

Original line number	Diff line number	Diff line
		@@ -16,13 +16,10 @@

		package android.window;

		import android.annotation.FlaggedApi;
		import android.annotation.NonNull;
		import android.app.Activity;
		import android.util.ArrayMap;

		import com.android.window.flags.Flags;

		import java.lang.ref.WeakReference;

		/**
		@@ -42,7 +39,6 @@ import java.lang.ref.WeakReference;
		* </pre>
		*/
		@SuppressWarnings("SingularCallback")
		@FlaggedApi(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK)
		public final class SystemOnBackInvokedCallbacks {
		private static final OverrideCallbackFactory<Activity> sMoveTaskToBackFactory = new
		MoveTaskToBackCallbackFactory();
		@@ -63,7 +59,6 @@ public final class SystemOnBackInvokedCallbacks {
		* @param activity The associated {@link Activity}
		* @see Activity#moveTaskToBack(boolean)
		*/
		@FlaggedApi(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK)
		@NonNull
		public static OnBackInvokedCallback moveTaskToBackCallback(@NonNull Activity activity) {
		return sMoveTaskToBackFactory.getOverrideCallback(activity);
		@@ -78,7 +73,6 @@ public final class SystemOnBackInvokedCallbacks {
		* @param activity The associated {@link Activity}
		* @see Activity#finishAndRemoveTask()
		*/
		@FlaggedApi(Flags.FLAG_PREDICTIVE_BACK_SYSTEM_OVERRIDE_CALLBACK)
		@NonNull
		public static OnBackInvokedCallback finishAndRemoveTaskCallback(@NonNull Activity activity) {
		return sFinishAndRemoveTaskFactory.getOverrideCallback(activity);

+5 −8

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.window.SystemOverrideOnBackInvokedCallback.OVERRIDE_UNDEFI

		import static com.android.window.flags.Flags.multipleSystemNavigationObserverCallbacks;
		import static com.android.window.flags.Flags.predictiveBackCallbackCancellationFix;
		import static com.android.window.flags.Flags.predictiveBackSystemOverrideCallback;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -212,14 +211,12 @@ public class WindowOnBackInvokedDispatcher implements OnBackInvokedDispatcher {
		mImeDispatcher.registerOnBackInvokedCallback(priority, callback);
		return;
		}
		if (predictiveBackSystemOverrideCallback()) {
		if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER
		&& callback instanceof SystemOverrideOnBackInvokedCallback) {
		Log.e(TAG, "System override callbacks cannot be registered to "
		+ "NAVIGATION_OBSERVER");
		return;
		}
		}
		if (priority == PRIORITY_SYSTEM_NAVIGATION_OBSERVER) {
		registerSystemNavigationObserverCallback(callback);
		return;