Merge "Don't leave FragmentManager in bad state after exception." (64ef3261) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1536,8 +1536,11 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
	}		}

	mExecutingActions = true;		mExecutingActions = true;
			try {
	action.run();		action.run();
			} finally {
	mExecutingActions = false;		mExecutingActions = false;
			}

	doPendingDeferredStart();		doPendingDeferredStart();
	}		}
	@@ -1574,11 +1577,14 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
	}		}

	mExecutingActions = true;		mExecutingActions = true;
			try {
	for (int i = 0; i < numActions; i++) {		for (int i = 0; i < numActions; i++) {
	mTmpActions[i].run();		mTmpActions[i].run();
	mTmpActions[i] = null;		mTmpActions[i] = null;
	}		}
			} finally {
	mExecutingActions = false;		mExecutingActions = false;
			}
	didSomething = true;		didSomething = true;
	}		}