Merge "Correctly save retained fragments in the backstack" into oc-dev (67cbbfe0) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+15 −13

Original line number	Diff line number	Diff line
		@@ -2603,23 +2603,25 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		f.mTargetIndex = f.mTarget != null ? f.mTarget.mIndex : -1;
		if (DEBUG) Log.v(TAG, "retainNonConfig: keeping retained " + f);
		}
		boolean addedChild = false;
		FragmentManagerNonConfig child;
		if (f.mChildFragmentManager != null) {
		f.mChildFragmentManager.saveNonConfig();
		FragmentManagerNonConfig child = f.mChildFragmentManager.mSavedNonConfig;
		if (child != null) {
		if (childFragments == null) {
		childFragments = new ArrayList<>();
		child = f.mChildFragmentManager.mSavedNonConfig;
		} else {
		// f.mChildNonConfig may be not null, when the parent fragment is
		// in the backstack.
		child = f.mChildNonConfig;
		}

		if (childFragments == null && child != null) {
		childFragments = new ArrayList<>(mActive.size());
		for (int j = 0; j < i; j++) {
		childFragments.add(null);
		}
		}

		if (childFragments != null) {
		childFragments.add(child);
		addedChild = true;
		}
		}
		if (childFragments != null && !addedChild) {
		childFragments.add(null);
		}
		}
		}