Merge "Fix NPE."

2012-07-25 11:02:23 -07:00
parent 500b003ff1 75fcac4eeb
commit fb5549f64b
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
@@ -234,7 +234,7 @@ public class GestureRecorder {
                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) {