Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a45e9251 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am dcd58cfd: Merge change I7b9328c7 into eclair 

Merge commit 'dcd58cfd' into eclair-mr2

* commit 'dcd58cfd':
  Fix issue #2300232: Bugs in resolving conflicting pointers
parents 21eb1738 dcd58cfd

services/java/com/android/server/InputDevice.java

+5 −2
Original line number Diff line number Diff line
@@ -313,14 +313,17 @@ public class InputDevice { 
            long bestDistance = -1;

            int bestIndex = -1;

            for (int j=0; j<lastNumPointers; j++) {

                if (!allowOverlap && last2Next[j] < 0) {

                // If we are not allowing multiple new points to be assigned

                // to the same old pointer, then skip this one if it is already

                // detected as a conflict (-2).

                if (!allowOverlap && last2Next[j] < -1) {

                    continue;

                }

                final int jd = j * MotionEvent.NUM_SAMPLE_DATA;

                final int xd = lastData[jd + MotionEvent.SAMPLE_X] - x1;

                final int yd = lastData[jd + MotionEvent.SAMPLE_Y] - y1;

                final long distance = xd*(long)xd + yd*(long)yd;

                if (j == 0 || distance < bestDistance) {

                if (bestDistance == -1 || distance < bestDistance) {

                    bestDistance = distance;

                    bestIndex = j;

                }