Snap for 9305793 from 70d49aa91dd3b196b0019177b9c0b8134f4a4b39 to tm-qpr2-release (2fd9f7b2) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+10 −13

Original line number	Diff line number	Diff line
		@@ -1684,7 +1684,7 @@ public class Activity extends ContextThemeWrapper
		.isOnBackInvokedCallbackEnabled(this);
		if (aheadOfTimeBack) {
		// Add onBackPressed as default back behavior.
		mDefaultBackCallback = this::navigateBack;
		mDefaultBackCallback = this::onBackInvoked;
		getOnBackInvokedDispatcher().registerSystemOnBackInvokedCallback(mDefaultBackCallback);
		}
		}
		@@ -4002,23 +4002,20 @@ public class Activity extends ContextThemeWrapper
		if (!fragmentManager.isStateSaved() && fragmentManager.popBackStackImmediate()) {
		return;
		}
		navigateBack();
		onBackInvoked();
		}

		private void navigateBack() {
		if (!isTaskRoot()) {
		// If the activity is not the root of the task, allow finish to proceed normally.
		finishAfterTransition();
		return;
		}
		// Inform activity task manager that the activity received a back press while at the
		// root of the task. This call allows ActivityTaskManager to intercept or move the task
		// to the back.
		ActivityClient.getInstance().onBackPressedOnTaskRoot(mToken,
		private void onBackInvoked() {
		// Inform activity task manager that the activity received a back press.
		// This call allows ActivityTaskManager to intercept or move the task
		// to the back when needed.
		ActivityClient.getInstance().onBackPressed(mToken,
		new RequestFinishCallback(new WeakReference<>(this)));

		if (isTaskRoot()) {
		getAutofillClientController().onActivityBackPressed(mIntent);
		}
		}

		/**
		* Called when a key shortcut event is not handled by any of the views in the Activity.

core/java/android/app/ActivityClient.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -525,9 +525,9 @@ public class ActivityClient {
		}
		}

		void onBackPressedOnTaskRoot(IBinder token, IRequestFinishCallback callback) {
		void onBackPressed(IBinder token, IRequestFinishCallback callback) {
		try {
		getActivityClientController().onBackPressedOnTaskRoot(token, callback);
		getActivityClientController().onBackPressed(token, callback);
		} catch (RemoteException e) {
		e.rethrowFromSystemServer();
		}

core/java/android/app/IActivityClientController.aidl

+2 −3

Original line number	Diff line number	Diff line
		@@ -145,10 +145,9 @@ interface IActivityClientController {
		void unregisterRemoteAnimations(in IBinder token);

		/**
		* Reports that an Activity received a back key press when there were no additional activities
		* on the back stack.
		* Reports that an Activity received a back key press.
		*/
		oneway void onBackPressedOnTaskRoot(in IBinder activityToken,
		oneway void onBackPressed(in IBinder activityToken,
		in IRequestFinishCallback callback);

		/** Reports that the splash screen view has attached to activity. */

core/java/android/app/IRequestFinishCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.app;

		/**
		* This callback allows ActivityTaskManager to ask the calling Activity
		* to finish in response to a call to onBackPressedOnTaskRoot.
		* to finish in response to a call to onBackPressed.
		*
		* {@hide}
		*/

core/java/android/app/prediction/AppPredictor.java

+34 −10

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import android.os.ServiceManager;
		import android.util.ArrayMap;
		import android.util.Log;

		import com.android.internal.annotations.GuardedBy;

		import dalvik.system.CloseGuard;

		import java.util.List;
		@@ -74,12 +76,12 @@ public final class AppPredictor {

		private static final String TAG = AppPredictor.class.getSimpleName();


		private final IPredictionManager mPredictionManager;
		private final CloseGuard mCloseGuard = CloseGuard.get();
		private final AtomicBoolean mIsClosed = new AtomicBoolean(false);

		private final AppPredictionSessionId mSessionId;
		@GuardedBy("itself")
		private final ArrayMap<Callback, CallbackWrapper> mRegisteredCallbacks = new ArrayMap<>();

		private final IBinder mToken = new Binder();
		@@ -97,7 +99,7 @@ public final class AppPredictor {
		IBinder b = ServiceManager.getService(Context.APP_PREDICTION_SERVICE);
		mPredictionManager = IPredictionManager.Stub.asInterface(b);
		mSessionId = new AppPredictionSessionId(
		context.getPackageName() + ":" + UUID.randomUUID().toString(), context.getUserId());
		context.getPackageName() + ":" + UUID.randomUUID(), context.getUserId());
		try {
		mPredictionManager.createPredictionSession(predictionContext, mSessionId, mToken);
		} catch (RemoteException e) {
		@@ -158,6 +160,15 @@ public final class AppPredictor {
		*/
		public void registerPredictionUpdates(@NonNull @CallbackExecutor Executor callbackExecutor,
		@NonNull AppPredictor.Callback callback) {
		synchronized (mRegisteredCallbacks) {
		registerPredictionUpdatesLocked(callbackExecutor, callback);
		}
		}

		@GuardedBy("mRegisteredCallbacks")
		private void registerPredictionUpdatesLocked(
		@NonNull @CallbackExecutor Executor callbackExecutor,
		@NonNull AppPredictor.Callback callback) {
		if (mIsClosed.get()) {
		throw new IllegalStateException("This client has already been destroyed.");
		}
		@@ -186,6 +197,13 @@ public final class AppPredictor {
		* @param callback The callback to be unregistered.
		*/
		public void unregisterPredictionUpdates(@NonNull AppPredictor.Callback callback) {
		synchronized (mRegisteredCallbacks) {
		unregisterPredictionUpdatesLocked(callback);
		}
		}

		@GuardedBy("mRegisteredCallbacks")
		private void unregisterPredictionUpdatesLocked(@NonNull AppPredictor.Callback callback) {
		if (mIsClosed.get()) {
		throw new IllegalStateException("This client has already been destroyed.");
		}
		@@ -238,7 +256,7 @@ public final class AppPredictor {
		}

		try {
		mPredictionManager.sortAppTargets(mSessionId, new ParceledListSlice(targets),
		mPredictionManager.sortAppTargets(mSessionId, new ParceledListSlice<>(targets),
		new CallbackWrapper(callbackExecutor, callback));
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to sort targets", e);
		@@ -254,7 +272,16 @@ public final class AppPredictor {
		if (!mIsClosed.getAndSet(true)) {
		mCloseGuard.close();

		// Do destroy;
		synchronized (mRegisteredCallbacks) {
		destroySessionLocked();
		}
		} else {
		throw new IllegalStateException("This client has already been destroyed.");
		}
		}

		@GuardedBy("mRegisteredCallbacks")
		private void destroySessionLocked() {
		try {
		mPredictionManager.onDestroyPredictionSession(mSessionId);
		} catch (RemoteException e) {
		@@ -262,9 +289,6 @@ public final class AppPredictor {
		e.rethrowAsRuntimeException();
		}
		mRegisteredCallbacks.clear();
		} else {
		throw new IllegalStateException("This client has already been destroyed.");
		}
		}

		@Override