commit 7318f72ffa1c461850fb08be90f867f0c8c92968
author Michael Jurka <mikejurka@google.com> Fri Oct 19 09:13:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 19 09:13:14 2012 -0700
tree 7f27de590b92375c07899038b25018be976743fd
parent bc5fb26739922e1a3a04f1c2faf5aefae54773b9
parent 9160410e40c8e060a7012a35b38f2532fa159084

am 9160410e: am eb91462f: am d6dd7c8a: Fix NPE

* commit '9160410e40c8e060a7012a35b38f2532fa159084':
  Fix NPE

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 6fcda8a..2c5f2b5 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -3482,7 +3482,9 @@
             anim.addListener(new AnimatorListenerAdapter() {
                 @Override
                 public void onAnimationEnd(Animator animation) {
-                    mWorkspace.postDelayed(mBuildLayersRunnable, 500);
+                    if (mWorkspace != null) {
+                        mWorkspace.postDelayed(mBuildLayersRunnable, 500);
+                    }
                 }
             });
             anim.start();