summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-07-29 19:07:23 -0700
committer Dianne Hackborn <hackbod@google.com> 2010-07-29 19:07:23 -0700
commit8952f695a322a75a29d404b47982e8be7ad31076 (patch)
tree4d218ca8ce75cb06b9919a1d7625e6fe0dc68155
parent5aa1c034d9bfdb2744f637c4686adf20a7ed9975 (diff)
Fix crash.
Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089
-rw-r--r--core/java/android/app/BackStackEntry.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/app/BackStackEntry.java b/core/java/android/app/BackStackEntry.java
index 729143834091..d63b862ac3d8 100644
--- a/core/java/android/app/BackStackEntry.java
+++ b/core/java/android/app/BackStackEntry.java
@@ -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: {