summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2014-10-31 15:10:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-31 15:10:07 +0000
commit17c2336c94765516ac6e1591b4c8578e89c18c70 (patch)
tree3749e68059d9f65eda53c4fc8088159162662faf /packages
parentf2f9f1edb78594253188e89502a65a63a41c147b (diff)
parent3804ebfbf9764a32d3d7e79ac95f3995db5e5117 (diff)
downloadframeworks_base-17c2336c94765516ac6e1591b4c8578e89c18c70.zip
frameworks_base-17c2336c94765516ac6e1591b4c8578e89c18c70.tar.gz
frameworks_base-17c2336c94765516ac6e1591b4c8578e89c18c70.tar.bz2
am ac457b1b: Merge "Fixed a crash in the Notification expandHelper" into lmp-mr1-dev
automerge: 3804ebf * commit '3804ebfbf9764a32d3d7e79ac95f3995db5e5117': Fixed a crash in the Notification expandHelper
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/ExpandHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index 0f8fe1c..d42ac61 100644
--- 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: