Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b88d4dfe authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix crash."

parents b827f458 8952f695

core/java/android/app/BackStackEntry.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -409,6 +409,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable { 
                    if (mAddToBackStack) {

                    if (mAddToBackStack) {

                        f.mBackStackNesting--;

                        f.mBackStackNesting--;

                    }

                    }

                    f.mImmediateActivity = null;

                    mManager.removeFragment(f,

                    mManager.removeFragment(f,

                            FragmentManager.reverseTransit(mTransition),

                            FragmentManager.reverseTransit(mTransition),

                            mTransitionStyle);

                            mTransitionStyle);
@@ -418,6 +419,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable { 
                    if (mAddToBackStack) {

                    if (mAddToBackStack) {

                        f.mBackStackNesting--;

                        f.mBackStackNesting--;

                    }

                    }

                    f.mImmediateActivity = null;

                    mManager.removeFragment(f,

                    mManager.removeFragment(f,

                            FragmentManager.reverseTransit(mTransition),

                            FragmentManager.reverseTransit(mTransition),

                            mTransitionStyle);

                            mTransitionStyle);
@@ -427,6 +429,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable { 
                            if (mAddToBackStack) {

                            if (mAddToBackStack) {

                                old.mBackStackNesting--;

                                old.mBackStackNesting--;

                            }

                            }

                            f.mImmediateActivity = mManager.mActivity;

                            mManager.addFragment(old, false);

                            mManager.addFragment(old, false);

                        }

                        }

                    }

                    }
@@ -436,6 +439,7 @@ final class BackStackEntry implements FragmentTransaction, Runnable { 
                    if (mAddToBackStack) {

                    if (mAddToBackStack) {

                        f.mBackStackNesting--;

                        f.mBackStackNesting--;

                    }

                    }

                    f.mImmediateActivity = mManager.mActivity;

                    mManager.addFragment(f, false);

                    mManager.addFragment(f, false);

                } break;

                } break;

                case OP_HIDE: {

                case OP_HIDE: {