Merge "Fix NPE."

dsandler · Android (Google) Code Review · commit fb5549f64b73 · 2012-07-25T11:02:24.000-07:00
diff --git 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 void save() {
                 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) {

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public void save() {`
`234`	`234`	`w.close();`
`235`	`235`	`mGestures.clear();`
`236`	`236`	`// If we have a pending gesture, push it back`
`237`		`- if (!mCurrentGesture.isComplete()) {`
	`237`	`+ if (mCurrentGesture != null && !mCurrentGesture.isComplete()) {`
`238`	`238`	`mGestures.add(mCurrentGesture);`
`239`	`239`	`}`
`240`	`240`	`if (DEBUG) {`