Sanity check item for being non-null.

This normally shouldn't happen, but experience has shown that there are
some rare corner cases where it indeed happens. The exact conditions are
unclear, but it's likely related to an ACTION_CANCEL event being sent
out before the ACTION_UP event.
In order to not crash in weird, hard-to-debug corner cases, just check
whether we actually have an item to process.

This fixes http://code.google.com/p/cyanogenmod/issues/detail?id=4985.

1 files changed, 8 insertions, 6 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ItemTouchDispatcher.java b/packages/SystemUI/src/com/android/systemui/statusbar/ItemTouchDispatcher.java
index ad8bc1d..ab487ea 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ItemTouchDispatcher.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ItemTouchDispatcher.java
@@ -47,14 +47,16 @@ public class ItemTouchDispatcher {
                         minDistance + " vX " + vX + " vY " + vY);
                 }
 
-                if (distance > minDistance && Math.abs(vX) > Math.abs(vY)) {
-                    mItem.finishSwipe(vX > 0);
-                    result = true;
-                } else {
-                    mItem.stopSwipe();
+                if (mItem != null) {
+                    if (distance > minDistance && Math.abs(vX) > Math.abs(vY)) {
+                        mItem.finishSwipe(vX > 0);
+                        result = true;
+                    } else {
+                        mItem.stopSwipe();
+                    }
+                    mItem = null;
                 }
 
-                mItem = null;
                 return result;
             }
         });