From 8952f695a322a75a29d404b47982e8be7ad31076 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 29 Jul 2010 19:07:23 -0700 Subject: [PATCH] Fix crash. Change-Id: Ie8871376213930f1c57ea5f8e67142daf7fbe089 --- core/java/android/app/BackStackEntry.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/android/app/BackStackEntry.java b/core/java/android/app/BackStackEntry.java index 729143834091c..d63b862ac3d87 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: {