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

Commit 6b87569b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev

parents 8da796d0 100ba76d

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();