commit 4152dadfe291253e70478af8003f4c17e79c7598
author Adam Cohen <adamcohen@google.com> Fri Feb 14 21:02:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:02:17 2014 +0000
tree 38de2513832278d84487e30e9fa61054f65c582f
parent 8cb26100ed44f5dc96996199a219730217ca9c69
parent 1b6b42e356f1365f23e2553a8718d4dfa9f52358

am 1b6b42e3: am ec6b71a0: am 531a5c32: am b0ee0810: Add guards for restoreInstanceState (issue 11982812)

* commit '1b6b42e356f1365f23e2553a8718d4dfa9f52358':
  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);
+            }
         }
     }