From ca42382f36561d0d368fdd6a9601fb7a81198c1d Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Wed, 13 Feb 2013 14:55:19 -0800
Subject: [PATCH] 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
---
 .../server/accessibility/AccessibilityManagerService.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index aadb790dbae14..e6cabdc29d0d8 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();