Merge "Fix NPE."
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
index b4b29da..81a16ae 100755
--- a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
@@ -234,7 +234,7 @@
                 w.close();
                 mGestures.clear();
                 // If we have a pending gesture, push it back
-                if (!mCurrentGesture.isComplete()) {
+                if (mCurrentGesture != null && !mCurrentGesture.isComplete()) {
                     mGestures.add(mCurrentGesture);
                 }
                 if (DEBUG) {