From dd64a9b0d6ff0f15b22d02a108c5342c74db995a Mon Sep 17 00:00:00 2001
From: Svetoslav Ganov <svetoslavganov@google.com>
Date: Tue, 13 Apr 2010 18:41:17 -0700
Subject: [PATCH]  2593833  AccessibilityManager not properly initialized
 immediately upon registration in the AccessibilityManagerService

Change-Id: I0226bafc5e9c5b800c54019c9309394f1e5f9e88
---
 .../view/accessibility/AccessibilityManager.java       |  2 +-
 .../view/accessibility/IAccessibilityManager.aidl      |  2 +-
 .../android/server/AccessibilityManagerService.java    | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/java/android/view/accessibility/AccessibilityManager.java b/core/java/android/view/accessibility/AccessibilityManager.java
index 01862700097d8..1fb107ae3bfa8 100644
--- a/core/java/android/view/accessibility/AccessibilityManager.java
+++ b/core/java/android/view/accessibility/AccessibilityManager.java
@@ -110,7 +110,7 @@ public final class AccessibilityManager {
         IBinder iBinder = ServiceManager.getService(Context.ACCESSIBILITY_SERVICE);
         mService = IAccessibilityManager.Stub.asInterface(iBinder);
         try {
-            mService.addClient(mClient);
+            mIsEnabled = mService.addClient(mClient);
         } catch (RemoteException re) {
             Log.e(LOG_TAG, "AccessibilityManagerService is dead", re);
         }
diff --git a/core/java/android/view/accessibility/IAccessibilityManager.aidl b/core/java/android/view/accessibility/IAccessibilityManager.aidl
index 32788be63670e..7633569d5312a 100644
--- a/core/java/android/view/accessibility/IAccessibilityManager.aidl
+++ b/core/java/android/view/accessibility/IAccessibilityManager.aidl
@@ -29,7 +29,7 @@ import android.content.pm.ServiceInfo;
  */
 interface IAccessibilityManager {
 
-    void addClient(IAccessibilityManagerClient client);
+    boolean addClient(IAccessibilityManagerClient client);
 
     boolean sendAccessibilityEvent(in AccessibilityEvent uiEvent);
 
diff --git a/services/java/com/android/server/AccessibilityManagerService.java b/services/java/com/android/server/AccessibilityManagerService.java
index 87de79affe3fa..83ce3e338d346 100644
--- a/services/java/com/android/server/AccessibilityManagerService.java
+++ b/services/java/com/android/server/AccessibilityManagerService.java
@@ -269,14 +269,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
             });
     }
 
-    public void addClient(IAccessibilityManagerClient client) {
+    public boolean addClient(IAccessibilityManagerClient client) {
         synchronized (mLock) {
-            try {
-                client.setEnabled(mIsEnabled);
-                mClients.add(client);
-            } catch (RemoteException re) {
-                Slog.w(LOG_TAG, "Dead AccessibilityManagerClient: " + client, re);
-            }
+            mClients.add(client);
+            return mIsEnabled;
         }
     }