Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 416b3777 authored by George Mount's avatar George Mount
Browse files

fix NPE when fragment container is null 

Bug 37529822

Test: ran against breaking application

Change-Id: Ib829b817eddf2e91898989a2f9e7885a6f5847e5
parent e4b64411

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);

                            }