commit c405bae90d861a2487367c34b1a2ebd695da340d
author Tim Kilbourn <tkilbourn@google.com> Fri Feb 28 20:13:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 28 20:13:11 2014 +0000
tree f04f002aca7b861be65d4dfa873ce1e2a8b44f42
parent be094d89db01387f773786435e110bbe166f3c65
parent 7071786e0074bea42b01236f817383cab69c1b63

am 7071786e: Clear child FragmentManagers when destroying Fragments.

* commit '7071786e0074bea42b01236f817383cab69c1b63':
  Clear child FragmentManagers when destroying Fragments.

core/java/android/app/Fragment.java

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index d626e5f..af8f177 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1402,6 +1402,7 @@
         mRestored = false;
         mBackStackNesting = 0;
         mFragmentManager = null;
+        mChildFragmentManager = null;
         mActivity = null;
         mFragmentId = 0;
         mContainerId = 0;

core/java/android/app/FragmentManager.java

diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index bf2a629..76f9d97 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1026,6 +1026,7 @@
                                     f.mActivity = null;
                                     f.mParentFragment = null;
                                     f.mFragmentManager = null;
+                                    f.mChildFragmentManager = null;
                                 }
                             }
                         }