Merge "[PB] Fix typo when migrate PB to shell transition." into main (e6622338) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -1313,7 +1313,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		info.getChanges().remove(j);
		}
		}
		tmpSize = info.getChanges().size();
		// Ignore merge if there is no close target
		if (!info.getChanges().isEmpty()) {
		tmpSize = init.getChanges().size();
		for (int i = 0; i < tmpSize; ++i) {
		final TransitionInfo.Change change = init.getChanges().get(i);
		if (moveToTop) {
		@@ -1323,6 +1325,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
		}
		info.getChanges().add(i, change);
		}
		}
		} else {
		// Open transition, the transition info should be:
		// init info(open A & wallpaper)