Merge "Only abort activity options when failing to bring a task to front" (4a1b3e25) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LE
		import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;

		import android.app.ActivityOptions;
		import android.content.Context;
		import android.os.Handler;

		/**
		* Wrapper around internal ActivityOptions creation.
		@@ -43,4 +45,17 @@ public abstract class ActivityOptionsCompat {
		RemoteAnimationAdapterCompat remoteAnimationAdapter) {
		return ActivityOptions.makeRemoteAnimation(remoteAnimationAdapter.getWrapped());
		}

		public static ActivityOptions makeCustomAnimation(Context context, int enterResId,
		int exitResId, final Runnable callback, final Handler callbackHandler) {
		return ActivityOptions.makeCustomAnimation(context, enterResId, exitResId, callbackHandler,
		new ActivityOptions.OnAnimationStartedListener() {
		@Override
		public void onAnimationStarted() {
		if (callback != null) {
		callbackHandler.post(callback);
		}
		}
		});
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1960,10 +1960,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		final TaskRecord task = mStackSupervisor.anyTaskForIdLocked(taskId);
		if (task == null) {
		Slog.d(TAG, "Could not find task for id: "+ taskId);
		SafeActivityOptions.abort(options);
		return;
		}
		if (getLockTaskController().isLockTaskModeViolation(task)) {
		Slog.e(TAG, "moveTaskToFront: Attempt to violate Lock Task Mode");
		SafeActivityOptions.abort(options);
		return;
		}
		ActivityOptions realOptions = options != null
		@@ -1983,7 +1985,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		SafeActivityOptions.abort(options);
		}

		boolean checkAppSwitchAllowedLocked(int sourcePid, int sourceUid,