Merge "Schedule lifecycle-stops after every transition" into tm-qpr-dev (8a55af9e) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/Transition.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -490,7 +490,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		}

		// Commit all going-invisible containers
		boolean activitiesWentInvisible = false;
		for (int i = 0; i < mParticipants.size(); ++i) {
		final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
		if (ar != null) {
		@@ -541,7 +540,6 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		}
		ar.commitVisibility(false /* visible /, false / performLayout */,
		true /* fromTransition */);
		activitiesWentInvisible = true;
		}
		}
		if (mChanges.get(ar).mVisible != visibleAtTransitionEnd) {
		@@ -568,12 +566,10 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
		mController.dispatchLegacyAppTransitionFinished(ar);
		}
		}
		if (activitiesWentInvisible) {
		// Always schedule stop processing when transition finishes because activities don't
		// stop while they are in a transition thus their stop could still be pending.
		mController.mAtm.mTaskSupervisor
		.scheduleProcessStoppingAndFinishingActivitiesIfNeeded();
		}

		sendRemoteCallback(mClientAnimationFinishCallback);