commit 5523db2ea31672fa555b897970e9c7f30f95f941
author Alan Viverette <alanv@google.com> Fri Feb 28 20:22:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 28 20:22:53 2014 +0000
tree dba7d7f65d90f55ef4fd64ecc4557035dd2b759c
parent ce601aee4cf632e5fc9fd23265f293eada7b0d35
parent 2ac93ae9194f84e18eafe07dc0304cfbb1297b00

Merge "Don't smooth scroll if the adapter is null"

core/java/android/app/Fragment.java

diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index c09da87..6c0d379 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -1405,6 +1405,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;
                                 }
                             }
                         }