From 8e2f41426ce162a164d1074dd67ea4549ffd0711 Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Fri, 20 Apr 2012 14:57:11 -0700
Subject: [PATCH] Fixes in the accessibility gesture dispatching.

1. The gesture dispatcher thread was not waiting in a loop
   that check for complete initialization. Therefore is was
   susceptible to missed signals and unexpected interrupts.

2. In the gesture processing message handle the interaction id
   was reading the wrong message argument.

bug:5932640

Change-Id: Ic65ecc01a7fe7d43929c6c07d0759ae9001cf515
---
 .../accessibility/AccessibilityManagerService.java   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 8215dcff6bf74..86efd17223cd8 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1007,10 +1007,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
             synchronized (mGestureLock) {
                 Thread worker = new Thread(this, THREAD_NAME);
                 worker.start();
-                try {
-                    mGestureLock.wait();
-                } catch (InterruptedException ie) {
-                    /*  ignore */
+                while (mHandler == null) {
+                    try {
+                        mGestureLock.wait();
+                    } catch (InterruptedException ie) {
+                        /*  ignore */
+                    }
                 }
             }
         }
@@ -1044,7 +1046,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
                     IAccessibilityServiceClient service =
                         (IAccessibilityServiceClient) message.obj;
                     final int gestureId = message.arg1;
-                    final int interactionId = message.arg1;
+                    final int interactionId = message.arg2;
 
                     try {
                         service.onGesture(gestureId, this, interactionId);