Merge "Prevent exit transition when a new task was started." (114c68ce) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -3704,9 +3704,6 @@ public class Activity extends ContextThemeWrapper
		* @see #startActivity
		*/
		public void startActivityForResult(Intent intent, int requestCode, @Nullable Bundle options) {
		if (options != null) {
		mActivityTransitionState.startExitOutTransition(this, options);
		}
		if (mParent == null) {
		Instrumentation.ActivityResult ar =
		mInstrumentation.execStartActivity(
		@@ -3742,6 +3739,9 @@ public class Activity extends ContextThemeWrapper
		mParent.startActivityFromChild(this, intent, requestCode);
		}
		}
		if (options != null && !isTopOfTask()) {
		mActivityTransitionState.startExitOutTransition(this, options);
		}
		}

		/**
		@@ -5207,9 +5207,8 @@ public class Activity extends ContextThemeWrapper
		* another task.
		*
		* @return true if this is the topmost, non-finishing activity in its task.
		* @hide
		*/
		public boolean isTopOfTask() {
		private boolean isTopOfTask() {
		try {
		return ActivityManagerNative.getDefault().isTopOfTask(mToken);
		} catch (RemoteException e) {