commit 9160410e40c8e060a7012a35b38f2532fa159084
author Michael Jurka <mikejurka@google.com> Fri Oct 19 09:11:17 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 19 09:11:17 2012 -0700
tree e2c4be394f6239fe42c162c9cdda9bdb1556c517
parent 5c69a9cc21815a2b5f62162fc807adb796c5ca0b
parent eb91462f087028e2ce22552ba8ce4e17b9a4f9c1

am eb91462f: am d6dd7c8a: Fix NPE

* commit 'eb91462f087028e2ce22552ba8ce4e17b9a4f9c1':
  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();