commit 4195da42b77e1f0bf69f2d36583cdd176ecc5288
author Ian Parkinson <ianp@google.com> Wed Jan 22 11:32:47 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 22 11:32:47 2014 -0800
tree d12a425c5b5972929c310cde722da5cd080293e6
parent f488644c2cbfa831aab1077e59458879cb7511a2
parent 944491587e8a8f77233a1916cc16cd07edd97f2e

am 94449158: Avoid NPE from delayed Runnable

* commit '944491587e8a8f77233a1916cc16cd07edd97f2e':
  Avoid NPE from delayed Runnable

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 503cc6a..709f4cf 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3952,9 +3952,11 @@
                     // when we are loading right after we return to launcher.
                     mWorkspace.postDelayed(new Runnable() {
                         public void run() {
-                            mWorkspace.snapToPage(newScreenIndex);
-                            mWorkspace.postDelayed(startBounceAnimRunnable,
-                                    NEW_APPS_ANIMATION_DELAY);
+                            if (mWorkspace != null) {
+                                mWorkspace.snapToPage(newScreenIndex);
+                                mWorkspace.postDelayed(startBounceAnimRunnable,
+                                        NEW_APPS_ANIMATION_DELAY);
+                            }
                         }
                     }, NEW_APPS_PAGE_MOVE_DELAY);
                 } else {