diff options
| author | 2013-02-13 23:13:52 +0000 | |
|---|---|---|
| committer | 2013-02-13 23:14:10 +0000 | |
| commit | eb26fbe427192bc87bb3dbb7882dbf87f760fab2 (patch) | |
| tree | 7fec8192f0313fb2c82532ae8973dd6dc83bbdf2 | |
| parent | 6e1a0738e9bcefc442ad45e1d6f6af0e5ace7b17 (diff) | |
| parent | 0726843ea088e7c6754fe6ac410749a852316aac (diff) | |
Merge "Fixing a NPE in accessibility manager service."
| -rw-r--r-- | services/java/com/android/server/accessibility/AccessibilityManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index aadb790dbae1..e6cabdc29d0d 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -565,8 +565,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { UserState userState = getCurrentUserStateLocked(); // Automation service is not bound, so pretend it died to perform clean up. if (userState.mUiAutomationService != null - && userState.mUiAutomationService.mServiceInterface != null && serviceClient != null + && userState.mUiAutomationService != null + && userState.mUiAutomationService.mServiceInterface != null && userState.mUiAutomationService.mServiceInterface.asBinder() == serviceClient.asBinder()) { userState.mUiAutomationService.binderDied(); |