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

Commit 5482ab01 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Throw exception in FragmentManager when queuing to a destroyed activity" into klp-dev

parents 12285f3d 95a4609b

core/java/android/app/FragmentManager.java

+8 −1
Original line number Diff line number Diff line
@@ -1328,12 +1328,19 @@ final class FragmentManagerImpl extends FragmentManager { 
        }

    }



    /**

     * Adds an action to the queue of pending actions.

     *

     * @param action the action to add

     * @param allowStateLoss whether to allow loss of state information

     * @throws IllegalStateException if the activity has been destroyed

     */

    public void enqueueAction(Runnable action, boolean allowStateLoss) {

        if (!allowStateLoss) {

            checkStateLoss();

        }

        synchronized (this) {

            if (mActivity == null) {

            if (mDestroyed || mActivity == null) {

                throw new IllegalStateException("Activity has been destroyed");

            }

            if (mPendingActions == null) {