Merge "fix NPE when fragment container is null" into oc-dev (01c9ed8b) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -1464,13 +1464,17 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		} else {
		final ViewGroup container = fragment.mContainer;
		final View animatingView = fragment.mView;
		if (container != null) {
		container.startViewTransition(animatingView);
		}
		// Delay the actual hide operation until the animation finishes, otherwise
		// the fragment will just immediately disappear
		anim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator animation) {
		if (container != null) {
		container.endViewTransition(animatingView);
		}
		animation.removeListener(this);
		animatingView.setVisibility(View.GONE);
		}