Merge "Fix null crash when fragments go away during animations" into honeycomb

2011-01-12 20:34:32 -08:00
parent 44a94bb5a9 b29407faf3
commit 7cc5e1d548
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -978,7 +978,9 @@ final class FragmentManagerImpl extends FragmentManager {
                    anim.addListener(new AnimatorListenerAdapter() {
                        @Override
                        public void onAnimationEnd(Animator animation) {
-                            finalFragment.mView.setVisibility(View.GONE);
+                            if (finalFragment.mView != null) {
+                                finalFragment.mView.setVisibility(View.GONE);
+                            }
                        }
                    });
                    anim.start();