commit 8a3ae91dd4e2245e439ff68c9b70f2dac7ca8b8f
author Joe Onorato <joeo@android.com> Mon Oct 12 11:25:20 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 11:25:20 2009 -0700
tree 55498ff42a7a8142ffe0a9b04766784298fc328c
parent 4d3551052a5fc71ce912537daa28a6e96b62c0fa
parent 539ed9dfee12564f0bf43822481c7a9b81e5d8b7

am 539ed9df: PASSION ONLY - fix npe

Merge commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7'

* commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7':
  PASSION ONLY - fix npe

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 613cd97..653ac28 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -288,8 +288,10 @@
                 }
 
                 mLastMotionX = -10000;
-                mVelocity.recycle();
-                mVelocity = null;
+                if (mVelocity != null) {
+                    mVelocity.recycle();
+                    mVelocity = null;
+                }
                 break;
             }
         }