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

Commit eff02141 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am fe3632bc: Merge into jb-mr1-dev 

* commit 'fe3632bc':
  More than one finger at a time can trigger a system crash.
parents 64d47a18 fe3632bc

services/java/com/android/server/accessibility/TouchExplorer.java

+4 −10
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.gesture.GestureStore; 
import android.gesture.GestureStroke;

import android.gesture.Prediction;

import android.graphics.Rect;

import android.os.Build;

import android.os.Handler;

import android.os.SystemClock;

import android.util.Slog;
@@ -687,16 +686,11 @@ class TouchExplorer implements EventStreamTransformation { 
                }

            } break;

            case MotionEvent.ACTION_POINTER_UP: {

                final int activePointerCount = mReceivedPointerTracker.getActivePointerCount();

                switch (activePointerCount) {

                    case 1: {

                        // Send an event to the end of the drag gesture.

                        sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);

                    } break;

                    default: {

                final int pointerId = event.getPointerId(event.getActionIndex());

                if (mReceivedPointerTracker.isActiveOrWasLastActiveUpPointer(pointerId)) {

                    sendUpForInjectedDownPointers(event, policyFlags);

                    mCurrentState = STATE_TOUCH_EXPLORING;

                }

                }

             } break;

            case MotionEvent.ACTION_UP: {

                // Announce the end of a new touch interaction.