Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev

2014-10-31 15:03:42 +00:00
parent 43d991ef8a 1b7f51ebc6
commit ac457b1bae
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
@@ -351,6 +351,9 @@ public class ExpandHelper implements Gefingerpoken {
                mVelocityTracker.addMovement(event);
                break;
            case MotionEvent.ACTION_MOVE:
+                if (mVelocityTracker == null) {
+                    mVelocityTracker = VelocityTracker.obtain();
+                }
                mVelocityTracker.addMovement(event);
                break;
            default: