Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-06-20 12:06:14 -07:00
committed by Android (Google) Code Review
parent 2c24de30a7 acdfbcca6f
commit b6ce1f311c
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
core/java/android/app/FragmentManager.java
View File

@@ -1118,7 +1118,9 @@ final class FragmentManagerImpl extends FragmentManager {
if (DEBUG) Log.v(TAG, "remove: " + fragment + " nesting=" + fragment.mBackStackNesting); if (DEBUG) Log.v(TAG, "remove: " + fragment + " nesting=" + fragment.mBackStackNesting);
final boolean inactive = !fragment.isInBackStack(); final boolean inactive = !fragment.isInBackStack();
if (!fragment.mDetached || inactive) { if (!fragment.mDetached || inactive) {
if (mAdded != null) {
mAdded.remove(fragment); mAdded.remove(fragment);
}
if (fragment.mHasMenu && fragment.mMenuVisible) { if (fragment.mHasMenu && fragment.mMenuVisible) {
mNeedMenuInvalidate = true; mNeedMenuInvalidate = true;
} }
@@ -1187,7 +1189,9 @@ final class FragmentManagerImpl extends FragmentManager {
fragment.mDetached = true; fragment.mDetached = true;
if (fragment.mAdded) { if (fragment.mAdded) {
// We are not already in back stack, so need to remove the fragment. // We are not already in back stack, so need to remove the fragment.
if (mAdded != null) {
mAdded.remove(fragment); mAdded.remove(fragment);
}
if (fragment.mHasMenu && fragment.mMenuVisible) { if (fragment.mHasMenu && fragment.mMenuVisible) {
mNeedMenuInvalidate = true; mNeedMenuInvalidate = true;
} }
@@ -1202,6 +1206,9 @@ final class FragmentManagerImpl extends FragmentManager {
if (fragment.mDetached) { if (fragment.mDetached) {
fragment.mDetached = false; fragment.mDetached = false;
if (!fragment.mAdded) { if (!fragment.mAdded) {
if (mAdded == null) {
mAdded = new ArrayList<Fragment>();
}
mAdded.add(fragment); mAdded.add(fragment);
fragment.mAdded = true; fragment.mAdded = true;
if (fragment.mHasMenu && fragment.mMenuVisible) { if (fragment.mHasMenu && fragment.mMenuVisible) {
@@ -1213,7 +1220,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public Fragment findFragmentById(int id) { public Fragment findFragmentById(int id) {
if (mActive != null) { if (mAdded != null) {
// First look through added fragments. // First look through added fragments.
for (int i=mAdded.size()-1; i>=0; i--) { for (int i=mAdded.size()-1; i>=0; i--) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
@@ -1221,6 +1228,8 @@ final class FragmentManagerImpl extends FragmentManager {
return f; return f;
} }
} }
}
if (mActive != null) {
// Now for any known fragment. // Now for any known fragment.
for (int i=mActive.size()-1; i>=0; i--) { for (int i=mActive.size()-1; i>=0; i--) {
Fragment f = mActive.get(i); Fragment f = mActive.get(i);
@@ -1233,7 +1242,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public Fragment findFragmentByTag(String tag) { public Fragment findFragmentByTag(String tag) {
if (mActive != null && tag != null) { if (mAdded != null && tag != null) {
// First look through added fragments. // First look through added fragments.
for (int i=mAdded.size()-1; i>=0; i--) { for (int i=mAdded.size()-1; i>=0; i--) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
@@ -1241,6 +1250,8 @@ final class FragmentManagerImpl extends FragmentManager {
return f; return f;
} }
} }
}
if (mActive != null && tag != null) {
// Now for any known fragment. // Now for any known fragment.
for (int i=mActive.size()-1; i>=0; i--) { for (int i=mActive.size()-1; i>=0; i--) {
Fragment f = mActive.get(i); Fragment f = mActive.get(i);
@@ -1817,7 +1828,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public void dispatchConfigurationChanged(Configuration newConfig) { public void dispatchConfigurationChanged(Configuration newConfig) {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null) { if (f != null) {
@@ -1828,7 +1839,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public void dispatchLowMemory() { public void dispatchLowMemory() {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null) { if (f != null) {
@@ -1839,7 +1850,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public void dispatchTrimMemory(int level) { public void dispatchTrimMemory(int level) {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null) { if (f != null) {
@@ -1852,7 +1863,7 @@ final class FragmentManagerImpl extends FragmentManager {
public boolean dispatchCreateOptionsMenu(Menu menu, MenuInflater inflater) { public boolean dispatchCreateOptionsMenu(Menu menu, MenuInflater inflater) {
boolean show = false; boolean show = false;
ArrayList<Fragment> newMenus = null; ArrayList<Fragment> newMenus = null;
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) { if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) {
@@ -1882,7 +1893,7 @@ final class FragmentManagerImpl extends FragmentManager {
public boolean dispatchPrepareOptionsMenu(Menu menu) { public boolean dispatchPrepareOptionsMenu(Menu menu) {
boolean show = false; boolean show = false;
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) { if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) {
@@ -1895,7 +1906,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public boolean dispatchOptionsItemSelected(MenuItem item) { public boolean dispatchOptionsItemSelected(MenuItem item) {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) { if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) {
@@ -1909,7 +1920,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public boolean dispatchContextItemSelected(MenuItem item) { public boolean dispatchContextItemSelected(MenuItem item) {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null && !f.mHidden && f.mUserVisibleHint) { if (f != null && !f.mHidden && f.mUserVisibleHint) {
@@ -1923,7 +1934,7 @@ final class FragmentManagerImpl extends FragmentManager {
} }
public void dispatchOptionsMenuClosed(Menu menu) { public void dispatchOptionsMenuClosed(Menu menu) {
if (mActive != null) { if (mAdded != null) {
for (int i=0; i<mAdded.size(); i++) { for (int i=0; i<mAdded.size(); i++) {
Fragment f = mAdded.get(i); Fragment f = mAdded.get(i);
if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) { if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible) {