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

Commit aebf9ea3 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "This may fix LoaderManager bug where a closed cursor could be used."

parents 78aa1f0b debb2e25

core/java/android/app/LoaderManager.java

+8 −5
Original line number Diff line number Diff line
@@ -185,12 +185,15 @@ class LoaderManagerImpl implements LoaderManager { 
        void stop() {

            if (DEBUG) Log.v(TAG, "  Stopping: " + this);

            mStarted = false;

            if (!mRetaining) {

                if (mLoader != null && mListenerRegistered) {

                    // Let the loader know we're done with it

                    mListenerRegistered = false;

                    mLoader.unregisterListener(this);

                    mLoader.stopLoading();

                }

                mData = null;

            }

        }

        

        void destroy() {