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

am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2

Browse Source 
* commit '68b81434963db90e0d5b14710e4edd86084ede3c':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
This commit is contained in:
Adam Powell
2011-06-07 16:22:32 -07:00
committed by Android Git Automerger
parent fc94d45fc2 68b8143496
commit 7ed8ff18ce
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/ScaleGestureDetector.java
View File

@@ -329,6 +329,15 @@ public class ScaleGestureDetector {
// Set focus point to the remaining finger // Set focus point to the remaining finger
final int index = event.findPointerIndex(actionId == mActiveId0 ? final int index = event.findPointerIndex(actionId == mActiveId0 ?
mActiveId1 : mActiveId0); mActiveId1 : mActiveId0);
if (index < 0) {
mInvalidGesture = true;
Log.e(TAG, "Invalid MotionEvent stream detected.", new Throwable());
if (mGestureInProgress) {
mListener.onScaleEnd(this);
}
return false;
}
mActiveId0 = event.getPointerId(index); mActiveId0 = event.getPointerId(index);
mActive0MostRecent = true; mActive0MostRecent = true;