diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-02-13 14:55:19 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-02-13 14:59:00 -0800 |
| commit | 0726843ea088e7c6754fe6ac410749a852316aac (patch) | |
| tree | 98468eedc4784fd2b3df155d37705c642c8e7600 /services/java/com/android/server/accessibility | |
| parent | fd0fa65eeae00f58863af060950e10f20971726b (diff) | |
| download | frameworks_base-0726843ea088e7c6754fe6ac410749a852316aac.zip frameworks_base-0726843ea088e7c6754fe6ac410749a852316aac.tar.gz frameworks_base-0726843ea088e7c6754fe6ac410749a852316aac.tar.bz2 | |
Fixing a NPE in accessibility manager service.
There was a missing null checks as a result of a recent
refactoring.
bug:8185435
Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
Diffstat (limited to 'services/java/com/android/server/accessibility')
| -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 aadb790..e6cabdc 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(); |