commit 0a80ff3de103077e04e73738d28bf036272902af
author Svetoslav <svetoslavganov@google.com> Mon Apr 15 12:10:36 2013 -0700
committer The Android Automerger <android-build@android.com> Mon Apr 15 16:50:31 2013 -0700
tree 36a9f0b99e76e2a319910e7217d770d63192eefe
parent 22921988c2bd5214af15d517dd358b4f10e2524c

Fully setup newly bound service before state management.

If the connected service is not entirely setup when calling the method for
handling a change in the current user state we get a potential NPE since
the management method may have discarded the service, thus nullifying the
connection to it. Now the service is fully configured before calling the
state change management method.

bug:8600489

Change-Id: Ib0bf7c6d575e15c620da419d43ece22f4187fd34

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

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 110c4da..ac4f970 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1817,11 +1817,13 @@
                 addServiceLocked(this, userState);
                 if (userState.mBindingServices.contains(mComponentName)) {
                     userState.mBindingServices.remove(mComponentName);
-                    onUserStateChangedLocked(userState);
                     try {
-                        mServiceInterface.setConnection(this, mId);
+                       mServiceInterface.setConnection(this, mId);
+                       onUserStateChangedLocked(userState);
                     } catch (RemoteException re) {
-                        Slog.w(LOG_TAG, "Error while setting connection for service: " + service, re);
+                        Slog.w(LOG_TAG, "Error while setting connection for service: "
+                                + service, re);
+                        binderDied();
                     }
                 } else {
                     binderDied();