commit ccbc2f309e84e9b073e92c1bf689a4d8dab988cc
author Michael Jurka <mikejurka@google.com> Fri Sep 02 15:44:09 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 02 15:44:09 2011 -0700
tree 3ae975782a669b527455c068853f624962b9e529
parent f743338c1ed6d84c1feea9888ee19755be0ba9f6
parent 21ce2d8caeda3c9eb762a2129d37c384de718941

Merge "Fix a NPE in Recents"

packages/SystemUI/src/com/android/systemui/SwipeHelper.java

diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index 1ebdfa1..0354fd7 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -165,11 +165,13 @@
             case MotionEvent.ACTION_DOWN:
                 mDragging = false;
                 mCurrView = mCallback.getChildAtPosition(ev);
-                mCurrAnimView = mCallback.getChildContentView(mCurrView);
-                mCanCurrViewBeDimissed = mCallback.canChildBeDismissed(mCurrView);
                 mVelocityTracker.clear();
-                mVelocityTracker.addMovement(ev);
-                mInitialTouchPos = getPos(ev);
+                if (mCurrView != null) {
+                    mCurrAnimView = mCallback.getChildContentView(mCurrView);
+                    mCanCurrViewBeDimissed = mCallback.canChildBeDismissed(mCurrView);
+                    mVelocityTracker.addMovement(ev);
+                    mInitialTouchPos = getPos(ev);
+                }
                 break;
             case MotionEvent.ACTION_MOVE:
                 if (mCurrView != null) {