Merge "[PB] Avoid resume activity while make paired activities visible." into main (e45cf980) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -2002,6 +2002,7 @@ class BackNavigationController {
		final Transition prepareOpen = migrateBackTransition && !tc.isCollecting()
		? tc.createTransition(TRANSIT_PREPARE_BACK_NAVIGATION) : null;

		DisplayContent commonDisplay = null;
		for (int i = affects.size() - 1; i >= 0; --i) {
		final ActivityRecord activity = affects.get(i);
		if (!migrateBackTransition && !activity.isVisibleRequested()) {
		@@ -2024,13 +2025,15 @@ class BackNavigationController {
		activity.mTaskSupervisor.mStoppingActivities.remove(activity);

		if (!migrateBackTransition) {
		activity.getDisplayContent().ensureActivitiesVisible(null /* starting */,
		true /* notifyClients */);
		commonDisplay = activity.getDisplayContent();
		} else if (activity.shouldBeVisible()) {
		activity.ensureActivityConfiguration(true /* ignoreVisibility */);
		activity.makeVisibleIfNeeded(null /* starting /, true / notifyToClient */);
		}
		}
		if (commonDisplay != null) {
		commonDisplay.ensureActivitiesVisible(null /* starting /, true / notifyClients */);
		}
		if (prepareOpen != null) {
		if (prepareOpen.hasChanges()) {
		tc.requestStartTransition(prepareOpen,