am 4a683a34: am 1ad66b2f: Merge "Fix issue #6584942 IllegalStateException:... (33644b9b) · Commits · e / os / android_frameworks_base

core/java/android/app/BackStackRecord.java

+38 −23

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ final class BackStackState implements Parcelable {
		int pos = 0;
		while (op != null) {
		mOps[pos++] = op.cmd;
		mOps[pos++] = op.fragment.mIndex;
		mOps[pos++] = op.fragment != null ? op.fragment.mIndex : -1;
		mOps[pos++] = op.enterAnim;
		mOps[pos++] = op.exitAnim;
		mOps[pos++] = op.popEnterAnim;
		@@ -99,8 +99,13 @@ final class BackStackState implements Parcelable {
		op.cmd = mOps[pos++];
		if (FragmentManagerImpl.DEBUG) Log.v(FragmentManagerImpl.TAG,
		"BSE " + bse + " set base fragment #" + mOps[pos]);
		Fragment f = fm.mActive.get(mOps[pos++]);
		int findex = mOps[pos++];
		if (findex >= 0) {
		Fragment f = fm.mActive.get(findex);
		op.fragment = f;
		} else {
		op.fragment = null;
		}
		op.enterAnim = mOps[pos++];
		op.exitAnim = mOps[pos++];
		op.popEnterAnim = mOps[pos++];
		@@ -506,9 +511,11 @@ final class BackStackRecord extends FragmentTransaction implements
		+ " by " + amt);
		Op op = mHead;
		while (op != null) {
		if (op.fragment != null) {
		op.fragment.mBackStackNesting += amt;
		if (FragmentManagerImpl.DEBUG) Log.v(TAG, "Bump nesting of "
		+ op.fragment + " to " + op.fragment.mBackStackNesting);
		}
		if (op.removed != null) {
		for (int i=op.removed.size()-1; i>=0; i--) {
		Fragment r = op.removed.get(i);
		@@ -568,7 +575,10 @@ final class BackStackRecord extends FragmentTransaction implements
		Fragment old = mManager.mAdded.get(i);
		if (FragmentManagerImpl.DEBUG) Log.v(TAG,
		"OP_REPLACE: adding=" + f + " old=" + old);
		if (old.mContainerId == f.mContainerId) {
		if (f == null \|\| old.mContainerId == f.mContainerId) {
		if (old == f) {
		op.fragment = f = null;
		} else {
		if (op.removed == null) {
		op.removed = new ArrayList<Fragment>();
		}
		@@ -583,8 +593,11 @@ final class BackStackRecord extends FragmentTransaction implements
		}
		}
		}
		}
		if (f != null) {
		f.mNextAnim = op.enterAnim;
		mManager.addFragment(f, false);
		}
		} break;
		case OP_REMOVE: {
		Fragment f = op.fragment;
		@@ -644,10 +657,12 @@ final class BackStackRecord extends FragmentTransaction implements
		} break;
		case OP_REPLACE: {
		Fragment f = op.fragment;
		if (f != null) {
		f.mNextAnim = op.popExitAnim;
		mManager.removeFragment(f,
		FragmentManagerImpl.reverseTransit(mTransition),
		mTransitionStyle);
		}
		if (op.removed != null) {
		for (int i=0; i<op.removed.size(); i++) {
		Fragment old = op.removed.get(i);

core/java/android/app/Fragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1503,7 +1503,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
		public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
		writer.print(prefix); writer.print("mFragmentId=#");
		writer.print(Integer.toHexString(mFragmentId));
		writer.print(" mContainerId#=");
		writer.print(" mContainerId=#");
		writer.print(Integer.toHexString(mContainerId));
		writer.print(" mTag="); writer.println(mTag);
		writer.print(prefix); writer.print("mState="); writer.print(mState);

core/java/android/app/FragmentManager.java

+17 −14

Original line number	Diff line number	Diff line
		@@ -726,11 +726,12 @@ final class FragmentManagerImpl extends FragmentManager {
		return;
		}
		f.mDeferStart = false;
		moveToState(f, mCurState, 0, 0);
		moveToState(f, mCurState, 0, 0, false);
		}
		}

		void moveToState(Fragment f, int newState, int transit, int transitionStyle) {
		void moveToState(Fragment f, int newState, int transit, int transitionStyle,
		boolean keepActive) {
		// Fragments that are not currently added will sit in the onCreate() state.
		if (!f.mAdded && newState > Fragment.CREATED) {
		newState = Fragment.CREATED;
		@@ -757,7 +758,7 @@ final class FragmentManagerImpl extends FragmentManager {
		// animation, move to whatever the final state should be once
		// the animation is done, and then we can proceed from there.
		f.mAnimatingAway = null;
		moveToState(f, f.mStateAfterAnimating, 0, 0);
		moveToState(f, f.mStateAfterAnimating, 0, 0, true);
		}
		switch (f.mState) {
		case Fragment.INITIALIZING:
		@@ -940,7 +941,7 @@ final class FragmentManagerImpl extends FragmentManager {
		if (fragment.mAnimatingAway != null) {
		fragment.mAnimatingAway = null;
		moveToState(fragment, fragment.mStateAfterAnimating,
		0, 0);
		0, 0, false);
		}
		}
		});
		@@ -992,6 +993,7 @@ final class FragmentManagerImpl extends FragmentManager {
		throw new SuperNotCalledException("Fragment " + f
		+ " did not call through to super.onDetach()");
		}
		if (!keepActive) {
		if (!f.mRetaining) {
		makeInactive(f);
		} else {
		@@ -1002,12 +1004,13 @@ final class FragmentManagerImpl extends FragmentManager {
		}
		}
		}
		}

		f.mState = newState;
		}

		void moveToState(Fragment f) {
		moveToState(f, mCurState, 0, 0);
		moveToState(f, mCurState, 0, 0, false);
		}

		void moveToState(int newState, boolean always) {
		@@ -1029,7 +1032,7 @@ final class FragmentManagerImpl extends FragmentManager {
		for (int i=0; i<mActive.size(); i++) {
		Fragment f = mActive.get(i);
		if (f != null) {
		moveToState(f, newState, transit, transitStyle);
		moveToState(f, newState, transit, transitStyle, false);
		if (f.mLoaderManager != null) {
		loadersRunning \|= f.mLoaderManager.hasRunningLoaders();
		}
		@@ -1122,7 +1125,7 @@ final class FragmentManagerImpl extends FragmentManager {
		fragment.mAdded = false;
		fragment.mRemoving = true;
		moveToState(fragment, inactive ? Fragment.INITIALIZING : Fragment.CREATED,
		transition, transitionStyle);
		transition, transitionStyle, false);
		}
		}

		@@ -1189,7 +1192,7 @@ final class FragmentManagerImpl extends FragmentManager {
		mNeedMenuInvalidate = true;
		}
		fragment.mAdded = false;
		moveToState(fragment, Fragment.CREATED, transition, transitionStyle);
		moveToState(fragment, Fragment.CREATED, transition, transitionStyle, false);
		}
		}
		}
		@@ -1204,7 +1207,7 @@ final class FragmentManagerImpl extends FragmentManager {
		if (fragment.mHasMenu && fragment.mMenuVisible) {
		mNeedMenuInvalidate = true;
		}
		moveToState(fragment, mCurState, transition, transitionStyle);
		moveToState(fragment, mCurState, transition, transitionStyle, false);
		}
		}
		}