summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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: {