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

Commit 22766c9a authored by Adam Powell's avatar Adam Powell Committed by android-build-merger
Browse files

Null check for restoring LoaderManagers am: 100ba76d 

am: bb2011a2

Change-Id: I8afc2a6f4808d1b36c1f2651617793854e799d11
parents c3fcd463 bb2011a2

core/java/android/app/FragmentHostCallback.java

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

    }





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

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

        if (loaderManagers != null) {

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

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

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

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

            }

            }

        }

        mAllLoaderManagers = loaderManagers;

        mAllLoaderManagers = loaderManagers;

    }

    }

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

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

            final FragmentManager fm2 = fc2.getFragmentManager();





            fc2.attachHost(null);

            fc2.attachHost(null);

            // Make sure nothing blows up on a null here

            fc2.restoreLoaderNonConfig(null);

            // for real this time

            fc2.restoreLoaderNonConfig(loaderNonConfig);

            fc2.restoreLoaderNonConfig(loaderNonConfig);

            fc2.restoreAllState(savedState, nonconf);

            fc2.restoreAllState(savedState, nonconf);

            fc2.dispatchCreate();

            fc2.dispatchCreate();