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

Commit e7181516 authored by George Mount's avatar George Mount
Browse files

Ensure transactions cannot be run during controller state change 

Bug 35349893

When the FragmentManager is being brought up or down, the state
of fragments is changed. Any fragment using commitNow() during
the state change was being allowed through instead of throwing.

This CL locks out reentrant fragment transctions during
FragmentManager state changes.

Test: Iea6029ccfa660e8eea5ea7472f641dada1a6c269
Change-Id: I735d86a42951c6f58f048e4930be925da9c8247e
parent c535d122

core/java/android/app/FragmentManager.java

+16 −0
Original line number Diff line number Diff line
@@ -2802,40 +2802,56 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate 
    

    public void dispatchCreate() {

        mStateSaved = false;

        mExecutingActions = true;

        moveToState(Fragment.CREATED, false);

        mExecutingActions = false;

    }

    

    public void dispatchActivityCreated() {

        mStateSaved = false;

        mExecutingActions = true;

        moveToState(Fragment.ACTIVITY_CREATED, false);

        mExecutingActions = false;

    }

    

    public void dispatchStart() {

        mStateSaved = false;

        mExecutingActions = true;

        moveToState(Fragment.STARTED, false);

        mExecutingActions = false;

    }

    

    public void dispatchResume() {

        mStateSaved = false;

        mExecutingActions = true;

        moveToState(Fragment.RESUMED, false);

        mExecutingActions = false;

    }

    

    public void dispatchPause() {

        mExecutingActions = true;

        moveToState(Fragment.STARTED, false);

        mExecutingActions = false;

    }

    

    public void dispatchStop() {

        mExecutingActions = true;

        moveToState(Fragment.STOPPED, false);

        mExecutingActions = false;

    }

    

    public void dispatchDestroyView() {

        mExecutingActions = true;

        moveToState(Fragment.CREATED, false);

        mExecutingActions = false;

    }



    public void dispatchDestroy() {

        mDestroyed = true;

        execPendingActions();

        mExecutingActions = true;

        moveToState(Fragment.INITIALIZING, false);

        mExecutingActions = false;

        mHost = null;

        mContainer = null;

        mParent = null;