drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Frameworks: fixes possible invalid pointer index call.

Browse Source 
Fixes possible invalid pointer index call in AbsListView.

Bug: 4982383
Change-Id: I9b88ab6a055c7678ef81fbe3187473edf8d12f6a
This commit is contained in:
Justin Koh
2011-06-30 17:11:26 -07:00
committed by Jeff Brown
parent 7564d62a77
commit 2585e9bd6d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/AbsListView.java
View File

@ -2888,7 +2888,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
final int pointerIndex = ev.findPointerIndex(mActivePointerId); int pointerIndex = ev.findPointerIndex(mActivePointerId);
if (pointerIndex == -1) {
pointerIndex = 0;
mActivePointerId = ev.getPointerId(pointerIndex);
}
final int y = (int) ev.getY(pointerIndex); final int y = (int) ev.getY(pointerIndex);
deltaY = y - mMotionY; deltaY = y - mMotionY;
switch (mTouchMode) { switch (mTouchMode) {
@ -3464,7 +3468,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
case MotionEvent.ACTION_MOVE: { case MotionEvent.ACTION_MOVE: {
switch (mTouchMode) { switch (mTouchMode) {
case TOUCH_MODE_DOWN: case TOUCH_MODE_DOWN:
final int pointerIndex = ev.findPointerIndex(mActivePointerId); int pointerIndex = ev.findPointerIndex(mActivePointerId);
if (pointerIndex == -1) {
pointerIndex = 0;
mActivePointerId = ev.getPointerId(pointerIndex);
}
final int y = (int) ev.getY(pointerIndex); final int y = (int) ev.getY(pointerIndex);
if (startScrollIfNeeded(y - mMotionY)) { if (startScrollIfNeeded(y - mMotionY)) {
return true; return true;