commit 531a5c324e20b354a674851fd4808c105a80af3a
author Adam Cohen <adamcohen@google.com> Tue Dec 03 17:59:52 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 03 17:59:52 2013 -0800
tree 2a0c074524d01269f425b563f66c13230cbc1dce
parent b4ee57927224429e34e3a81519b2ea658e41fc45
parent b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea

am b0ee0810: Add guards for restoreInstanceState (issue 11982812)

* commit 'b0ee08109ec89959d9bbd526c6e5f7ab96c8c3ea':
  Add guards for restoreInstanceState (issue 11982812)

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4d9dff9..74f28b3 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2298,7 +2298,7 @@
                 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

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index e4ba743..da1dbfe 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -4264,7 +4264,9 @@
         if (mSavedStates != null) {
             mRestoredPages.add(child);
             CellLayout cl = (CellLayout) getChildAt(child);
-            cl.restoreInstanceState(mSavedStates);
+            if (cl != null) {
+                cl.restoreInstanceState(mSavedStates);
+            }
         }
     }