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

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

am b10e2f1a: Merge change Iac534225 into eclair 

Merge commit 'b10e2f1a' into eclair-mr2

* commit 'b10e2f1a':
  Fix issue #2186709: Can't unlock the device for a while
parents a5bfe52d b10e2f1a

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

+2 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ public class InputDevice { 
                while (start != end) {

                    int soff = poff + (start*MotionEvent.NUM_SAMPLE_DATA);

                    int pressure = mHistoryData[soff + MotionEvent.SAMPLE_PRESSURE];

                    if (pressure <= 0) pressure = 1;

                    x += mHistoryData[soff + MotionEvent.SAMPLE_X] * pressure;

                    y += mHistoryData[soff + MotionEvent.SAMPLE_Y] * pressure;

                    totalPressure += pressure;
@@ -276,6 +277,7 @@ public class InputDevice { 
                }

                int eoff = poff + (end*MotionEvent.NUM_SAMPLE_DATA);

                int pressure = mHistoryData[eoff + MotionEvent.SAMPLE_PRESSURE];

                if (pressure <= 0) pressure = 1;

                x += mHistoryData[eoff + MotionEvent.SAMPLE_X] * pressure;

                y += mHistoryData[eoff + MotionEvent.SAMPLE_Y] * pressure;

                totalPressure += pressure;