commit | fb5549f64b73069934d79b8ceefa51475bfb2d08 | [log] [tgz] |
---|---|---|
author | Daniel Sandler <dsandler@android.com> | Wed Jul 25 11:02:23 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 25 11:02:24 2012 -0700 |
tree | 2bf4b6fcbfa16951f90531f895dc7b76d12d140b | |
parent | 500b003ff14b8a5aee2927bb577ab68d71ccfc12 [diff] | |
parent | 75fcac4eebdf7ff68a534e9af1664c571f40ef30 [diff] |
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) {