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

Commit 825c6e0d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Null check for restoring LoaderManagers am: 100ba76d am: bb2011a2"... 

Merge "Null check for restoring LoaderManagers am: 100ba76d am: bb2011a2" into nyc-mr1-dev-plus-aosp
parents 73713dad 22766c9a

core/java/android/app/FragmentHostCallback.java

+4 −2
Original line number Diff line number Diff line
@@ -340,9 +340,11 @@ public abstract class FragmentHostCallback<E> extends FragmentContainer { 
    }



    void restoreLoaderNonConfig(ArrayMap<String, LoaderManager> loaderManagers) {

        if (loaderManagers != null) {

            for (int i = 0, N = loaderManagers.size(); i < N; i++) {

                ((LoaderManagerImpl) loaderManagers.valueAt(i)).updateHostController(this);

            }

        }

        mAllLoaderManagers = loaderManagers;

    }

core/tests/coretests/src/android/app/LoaderLifecycleTest.java

+3 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ public class LoaderLifecycleTest { 
            final FragmentManager fm2 = fc2.getFragmentManager();



            fc2.attachHost(null);

            // Make sure nothing blows up on a null here

            fc2.restoreLoaderNonConfig(null);

            // for real this time

            fc2.restoreLoaderNonConfig(loaderNonConfig);

            fc2.restoreAllState(savedState, nonconf);

            fc2.dispatchCreate();