fix NPE when fragment container is null
Bug 37529822
Test: ran against breaking application
Change-Id: Ib829b817eddf2e91898989a2f9e7885a6f5847e5
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index c1161a2..b6a578b 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1464,13 +1464,17 @@
} else {
final ViewGroup container = fragment.mContainer;
final View animatingView = fragment.mView;
- container.startViewTransition(animatingView);
+ 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) {
- container.endViewTransition(animatingView);
+ if (container != null) {
+ container.endViewTransition(animatingView);
+ }
animation.removeListener(this);
animatingView.setVisibility(View.GONE);
}