Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev

Browse Source 
* commit '2cc95775750ccd46f3192c05804c38dc04c5d2d6':
  Fix possible crash in System UI
This commit is contained in:
Jim Miller
2013-10-15 14:47:49 -07:00
committed by Android Git Automerger
parent d99b9fd321 2cc9577575
commit d5bda74797
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Keyguard/src/com/android/keyguard/PagedView.java
View File

@@ -1556,6 +1556,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
if (mTouchState == TOUCH_STATE_SCROLLING) { if (mTouchState == TOUCH_STATE_SCROLLING) {
final int activePointerId = mActivePointerId; final int activePointerId = mActivePointerId;
final int pointerIndex = ev.findPointerIndex(activePointerId); final int pointerIndex = ev.findPointerIndex(activePointerId);
if (pointerIndex == -1) return true;
final float x = ev.getX(pointerIndex); final float x = ev.getX(pointerIndex);
final VelocityTracker velocityTracker = mVelocityTracker; final VelocityTracker velocityTracker = mVelocityTracker;
velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity); velocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);