am c405bae9: am 7071786e: Clear child FragmentManagers when destroying Fragments.

* commit 'c405bae90d861a2487367c34b1a2ebd695da340d':
  Clear child FragmentManagers when destroying Fragments.

2 files changed, 2 insertions, 0 deletions

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index d626e5f54aee..af8f1776599b 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1402,6 +1402,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
         mRestored = false;
         mBackStackNesting = 0;
         mFragmentManager = null;
+        mChildFragmentManager = null;
         mActivity = null;
         mFragmentId = 0;
         mContainerId = 0;
diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index bf2a6292ce66..76f9d97455cf 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1026,6 +1026,7 @@ final class FragmentManagerImpl extends FragmentManager {
                                     f.mActivity = null;
                                     f.mParentFragment = null;
                                     f.mFragmentManager = null;
+                                    f.mChildFragmentManager = null;
                                 }
                             }
                         }