Merge "Bug 5535639 - Monkeys mad at FragmentManager" into ics-mr1 (1759af3b) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1025,6 +1025,8 @@ final class FragmentManagerImpl extends FragmentManager {
		}

		void startPendingDeferredFragments() {
		if (mActive == null) return;

		for (int i=0; i<mActive.size(); i++) {
		Fragment f = mActive.get(i);
		if (f != null) {

+4 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ class LoaderManagerImpl extends LoaderManager {
		mInactiveLoaders.remove(mId);
		}

		if (!hasRunningLoaders() && mActivity != null) {
		if (mActivity != null && !hasRunningLoaders()) {
		mActivity.mFragments.startPendingDeferredFragments();
		}
		}
		@@ -681,6 +681,9 @@ class LoaderManagerImpl extends LoaderManager {
		mInactiveLoaders.removeAt(idx);
		info.destroy();
		}
		if (mActivity != null && !hasRunningLoaders()) {
		mActivity.mFragments.startPendingDeferredFragments();
		}
		}

		/**