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

Commit e40b7136 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments... 

am b41d9f8a: Merge "Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1

* commit 'b41d9f8a':
  Fix bug 5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
parents 05c6756b b41d9f8a

core/java/android/app/FragmentManager.java

+3 −2
Original line number Diff line number Diff line
@@ -725,8 +725,9 @@ final class FragmentManagerImpl extends FragmentManager { 
            // While removing a fragment, we can't change it to a higher state.

            newState = f.mState;

        }

        // Defer start if requested; don't allow it to move to STARTED or higher.

        if (f.mDeferStart && newState > Fragment.STOPPED) {

        // Defer start if requested; don't allow it to move to STARTED or higher

        // if it's not already started.

        if (f.mDeferStart && f.mState < Fragment.STARTED && newState > Fragment.STOPPED) {

            newState = Fragment.STOPPED;

        }

        if (f.mState < newState) {