Merge "Protect FragmentManager from Menu calls while not CREATED." (0033e5f7) · Commits · e / os / android_frameworks_base

core/java/android/app/FragmentManager.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -3101,6 +3101,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

		public boolean dispatchCreateOptionsMenu(Menu menu, MenuInflater inflater) {
		if (mCurState < Fragment.CREATED) {
		return false;
		}
		boolean show = false;
		ArrayList<Fragment> newMenus = null;
		for (int i = 0; i < mAdded.size(); i++) {
		@@ -3131,6 +3134,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

		public boolean dispatchPrepareOptionsMenu(Menu menu) {
		if (mCurState < Fragment.CREATED) {
		return false;
		}
		boolean show = false;
		for (int i = 0; i < mAdded.size(); i++) {
		Fragment f = mAdded.get(i);
		@@ -3144,6 +3150,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

		public boolean dispatchOptionsItemSelected(MenuItem item) {
		if (mCurState < Fragment.CREATED) {
		return false;
		}
		for (int i = 0; i < mAdded.size(); i++) {
		Fragment f = mAdded.get(i);
		if (f != null) {
		@@ -3156,6 +3165,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

		public boolean dispatchContextItemSelected(MenuItem item) {
		if (mCurState < Fragment.CREATED) {
		return false;
		}
		for (int i = 0; i < mAdded.size(); i++) {
		Fragment f = mAdded.get(i);
		if (f != null) {
		@@ -3168,6 +3180,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
		}

		public void dispatchOptionsMenuClosed(Menu menu) {
		if (mCurState < Fragment.CREATED) {
		return;
		}
		for (int i = 0; i < mAdded.size(); i++) {
		Fragment f = mAdded.get(i);
		if (f != null) {