am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 (b4815f47) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -1109,7 +1109,6 @@ final class FragmentManagerImpl extends FragmentManager {
		mNeedMenuInvalidate = true;
		}
		fragment.mAdded = false;
		fragment.mRemoving = true;
		moveToState(fragment, Fragment.CREATED, transition, transitionStyle);
		}
		}
		@@ -1122,7 +1121,6 @@ final class FragmentManagerImpl extends FragmentManager {
		if (!fragment.mAdded) {
		mAdded.add(fragment);
		fragment.mAdded = true;
		fragment.mRemoving = false;
		if (fragment.mHasMenu) {
		mNeedMenuInvalidate = true;
		}
		@@ -1435,6 +1433,7 @@ final class FragmentManagerImpl extends FragmentManager {

		if (f.mView != null) {
		saveFragmentViewState(f);
		}
		if (f.mSavedViewState != null) {
		if (result == null) {
		result = new Bundle();
		@@ -1442,7 +1441,6 @@ final class FragmentManagerImpl extends FragmentManager {
		result.putSparseParcelableArray(
		FragmentManagerImpl.VIEW_STATE_TAG, f.mSavedViewState);
		}
		}

		return result;
		}