diff options
| author | Mike Cleron <mcleron@google.com> | 2012-10-03 17:07:04 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 17:07:05 -0700 |
| commit | 0fd713ca12da9a1ecaaca3a117057b8d94704a99 (patch) | |
| tree | 6ebf7187f60dc6b4cd20b3c41a36db50c62e3e56 /services/java | |
| parent | 88c3a51123bf39988c33c9074289fddff0e0fec8 (diff) | |
| parent | ec33d56300aa417efb4a055786d73d1bf23a6a85 (diff) | |
| download | frameworks_base-0fd713ca12da9a1ecaaca3a117057b8d94704a99.zip frameworks_base-0fd713ca12da9a1ecaaca3a117057b8d94704a99.tar.gz frameworks_base-0fd713ca12da9a1ecaaca3a117057b8d94704a99.tar.bz2 | |
Merge "Exception in the touch explorer when dragging." into jb-mr1-dev
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/accessibility/TouchExplorer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java index c9f89b1..2d81b6c 100644 --- a/services/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/java/com/android/server/accessibility/TouchExplorer.java @@ -645,7 +645,9 @@ class TouchExplorer implements EventStreamTransformation { // We are in dragging state so we have two pointers and another one // goes down => delegate the three pointers to the view hierarchy mCurrentState = STATE_DELEGATING; - sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + if (mDraggingPointerId != INVALID_POINTER_ID) { + sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + } sendDownForAllActiveNotInjectedPointers(event, policyFlags); } break; case MotionEvent.ACTION_MOVE: { |