Merge "TouchExplorer crashes if there is incative pointer while dragging." into ics-mr0

Author: sganov

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

@@ -487,8 +487,16 @@ private void handleMotionEventStateDragging(MotionEvent event, int policyFlags)
                 }
             } break;
             case MotionEvent.ACTION_POINTER_UP: {
-                // Send an event to the end of the drag gesture.
-                sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
+                final int activePointerCount = mPointerTracker.getActivePointerCount();
+                switch (activePointerCount) {
+                    case 1: {
+                        // Send an event to the end of the drag gesture.
+                        sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags);
+                    } break;
+                    default: {
+                        mCurrentState = STATE_TOUCH_EXPLORING;
+                    }
+                }
              } break;
             case MotionEvent.ACTION_UP: {
                 mCurrentState = STATE_TOUCH_EXPLORING;