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

Commit 8c4fa361 authored by George Mount's avatar George Mount
Browse files

Fix: fragment destroyed improperly during pop. 

Bug 34850219

When multiple back stack records were popped together,
to the bottom of the stack, the fragment at the bottom
would be destroyed. This was caused by the back stack
being bumped prior to executing the operations. The
back stack record index didn't properly reflect the
state it should be in during the operation and the
final fragment returned false to isInBackStack().

This CL moves the back stack bumping to immediately
prior to executing the operations.

Test: I887d565d245cd61434963040c20f887a10bf51dc
Change-Id: I3ad2be65cf0e66bf5615c0e912cc233528ee72a3
parent 6ba95dab

core/java/android/app/FragmentManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2077,8 +2077,6 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
            } else {

                record.trackAddedFragmentsInPop(mTmpAddedFragments);

            }

            final int bumpAmount = isPop ? -1 : 1;

            record.bumpBackStackNesting(bumpAmount);

            addToBackStack = addToBackStack || record.mAddToBackStack;

        }

        mTmpAddedFragments.clear();
@@ -2281,8 +2279,10 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
            final BackStackRecord record = records.get(i);

            final boolean isPop = isRecordPop.get(i);

            if (isPop) {

                record.bumpBackStackNesting(-1);

                record.executePopOps();

            } else {

                record.bumpBackStackNesting(1);

                record.executeOps();

            }

        }