Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1

Author: adamp

core/java/android/app/FragmentManager.java

@@ -1025,6 +1025,8 @@ void moveToState(int newState, int transit, int transitStyle, boolean always) {
     }
 
     void startPendingDeferredFragments() {
+        if (mActive == null) return;
+
         for (int i=0; i<mActive.size(); i++) {
             Fragment f = mActive.get(i);
             if (f != null) {

core/java/android/app/LoaderManager.java

@@ -419,7 +419,7 @@ void destroy() {
                 mInactiveLoaders.remove(mId);
             }
 
-            if (!hasRunningLoaders() && mActivity != null) {
+            if (mActivity != null && !hasRunningLoaders()) {
                 mActivity.mFragments.startPendingDeferredFragments();
             }
         }
@@ -681,6 +681,9 @@ public void destroyLoader(int id) {
             mInactiveLoaders.removeAt(idx);
             info.destroy();
         }
+        if (mActivity != null && !hasRunningLoaders()) {
+            mActivity.mFragments.startPendingDeferredFragments();
+        }
     }
 
     /**