Merge "Fix NPE when combining pop with add transaction." (0882330c) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentTransition.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -780,8 +780,10 @@ class FragmentTransition {
		names = inTransaction.mSharedElementTargetNames;
		}

		if (names != null) {
		inSharedElements.retainAll(names);
		if (sharedElementCallback != null) {
		}
		if (names != null && sharedElementCallback != null) {
		sharedElementCallback.onMapSharedElements(names, inSharedElements);
		for (int i = names.size() - 1; i >= 0; i--) {
		String name = names.get(i);
		@@ -830,8 +832,9 @@ class FragmentTransition {
		FragmentContainerTransition fragments,
		Transition enterTransition, boolean inIsPop) {
		BackStackRecord inTransaction = fragments.lastInTransaction;
		if (enterTransition != null && inTransaction.mSharedElementSourceNames != null &&
		!inTransaction.mSharedElementSourceNames.isEmpty()) {
		if (enterTransition != null && inSharedElements != null
		&& inTransaction.mSharedElementSourceNames != null
		&& !inTransaction.mSharedElementSourceNames.isEmpty()) {
		final String targetName = inIsPop
		? inTransaction.mSharedElementSourceNames.get(0)
		: inTransaction.mSharedElementTargetNames.get(0);
		@@ -1096,7 +1099,9 @@ class FragmentTransition {
		if (transition != null) {
		viewList = new ArrayList<>();
		View root = fragment.getView();
		if (root != null) {
		root.captureTransitioningViews(viewList);
		}
		if (sharedElements != null) {
		viewList.removeAll(sharedElements);
		}