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

Commit b0ee0810 authored by Adam Cohen's avatar Adam Cohen
Browse files

Add guards for restoreInstanceState (issue 11982812) 

Change-Id: Ic4c632a956130ab28843085490dc1badb39b0e8c
parent b3084e87

src/com/android/launcher3/LauncherModel.java

+1 −1
Original line number Diff line number Diff line
@@ -2298,7 +2298,7 @@ public class LauncherModel extends BroadcastReceiver { 
                r = new Runnable() {

                    public void run() {

                        Callbacks callbacks = tryGetCallbacks(oldCallbacks);

                        if (callbacks != null) {

                        if (callbacks != null && currentScreen >= 0) {

                            callbacks.onPageBoundSynchronously(currentScreen);

                        }

                    }

src/com/android/launcher3/Workspace.java

+3 −1
Original line number Diff line number Diff line
@@ -4254,9 +4254,11 @@ public class Workspace extends SmoothPagedView 
        if (mSavedStates != null) {

            mRestoredPages.add(child);

            CellLayout cl = (CellLayout) getChildAt(child);

            if (cl != null) {

                cl.restoreInstanceState(mSavedStates);

            }

        }

    }



    public void restoreInstanceStateForRemainingPages() {

        int count = getChildCount();