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

Merge "Fix crash."

Browse Source
This commit is contained in:
Dianne Hackborn
2010-07-29 19:11:01 -07:00
committed by Android (Google) Code Review
parent b827f458e1 8952f695a3
commit b88d4dfeb5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/BackStackEntry.java
View File

@@ -409,6 +409,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable {
if (mAddToBackStack) {
f.mBackStackNesting--;
}
f.mImmediateActivity = null;
mManager.removeFragment(f,
FragmentManager.reverseTransit(mTransition),
mTransitionStyle);
@@ -418,6 +419,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable {
if (mAddToBackStack) {
f.mBackStackNesting--;
}
f.mImmediateActivity = null;
mManager.removeFragment(f,
FragmentManager.reverseTransit(mTransition),
mTransitionStyle);
@@ -427,6 +429,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable {
if (mAddToBackStack) {
old.mBackStackNesting--;
}
f.mImmediateActivity = mManager.mActivity;
mManager.addFragment(old, false);
}
}
@@ -436,6 +439,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable {
if (mAddToBackStack) {
f.mBackStackNesting--;
}
f.mImmediateActivity = mManager.mActivity;
mManager.addFragment(f, false);
} break;
case OP_HIDE: {