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	Diff line number	Diff line
		@@ -1536,8 +1536,11 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

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

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

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