diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-04-15 21:51:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-15 21:51:22 +0000 |
| commit | 289e64974a3be70ff823ee0a0c1fe5ea32a832bb (patch) | |
| tree | 3c788a032f2a911a60daaf1243d852f3bbc90fa8 /services | |
| parent | 30c990c361291ad578ef4ffe4a4dd0fd6080797b (diff) | |
| parent | 072906eef827cd8d92b48f79975d4f2e21d1c958 (diff) | |
| download | frameworks_base-289e64974a3be70ff823ee0a0c1fe5ea32a832bb.zip frameworks_base-289e64974a3be70ff823ee0a0c1fe5ea32a832bb.tar.gz frameworks_base-289e64974a3be70ff823ee0a0c1fe5ea32a832bb.tar.bz2 | |
Merge "Fully setup newly bound service before state management." into jb-mr2-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/accessibility/AccessibilityManagerService.java | 8 |
1 files changed, 5 insertions, 3 deletions
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 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 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(); |