From 416b3777598f864f74f645317f3c5e9430c5be0f Mon Sep 17 00:00:00 2001 From: George Mount Date: Thu, 20 Apr 2017 13:16:52 -0700 Subject: [PATCH] fix NPE when fragment container is null Bug 37529822 Test: ran against breaking application Change-Id: Ib829b817eddf2e91898989a2f9e7885a6f5847e5 --- core/java/android/app/FragmentManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index c1161a2eb0cf..b6a578b5ad5b 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -1464,13 +1464,17 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate } 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); } -- 2.11.0