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

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

am cbf77e9b: Merge change I875200fe into eclair 

Merge commit 'cbf77e9b' into eclair-mr2

* commit 'cbf77e9b':
  Another fix for #2186897: Cannot unlock the device by swiping
parents 398c24ec cbf77e9b

services/java/com/android/server/KeyInputQueue.java

+6 −3
Original line number Diff line number Diff line
@@ -721,11 +721,14 @@ public abstract class KeyInputQueue { 
                                        // virtual key area...  but still

                                        // propagate this to the previous

                                        // data for comparisons.

                                        int num = ms.mNextNumPointers;

                                        if (num > InputDevice.MAX_POINTERS) {

                                            num = InputDevice.MAX_POINTERS;

                                        }

                                        System.arraycopy(ms.mNextData, 0,

                                                ms.mLastData, 0,

                                                ms.mNextNumPointers

                                                        * MotionEvent.NUM_SAMPLE_DATA);

                                        ms.mLastNumPointers = ms.mNextNumPointers;

                                                num * MotionEvent.NUM_SAMPLE_DATA);

                                        ms.mLastNumPointers = num;

                                    }

                                    

                                    ms.finish();