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

Commit c091a649 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Fix back stack problems due to postponed transitions" into oc-dev 

am: ce50eb2d

Change-Id: I8ef9d7f968541dea17198aac89441f2617fab828
parents 5deb5277 ce50eb2d

core/java/android/app/FragmentManager.java

+5 −1
Original line number Diff line number Diff line
@@ -2303,11 +2303,15 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
     */

    private void completeExecute(BackStackRecord record, boolean isPop, boolean runTransitions,

            boolean moveToState) {

        if (isPop) {

            record.executePopOps(moveToState);

        } else {

            record.executeOps();

        }

        ArrayList<BackStackRecord> records = new ArrayList<>(1);

        ArrayList<Boolean> isRecordPop = new ArrayList<>(1);

        records.add(record);

        isRecordPop.add(isPop);

        executeOps(records, isRecordPop, 0, 1);

        if (runTransitions) {

            FragmentTransition.startTransitions(this, records, isRecordPop, 0, 1, true);

        }