From a514b4fe809c1d0cf69dab23776f5ee20c4058c9 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Wed, 13 Feb 2013 15:47:29 -0800
Subject: [PATCH] Proper clean up when Ui test automation service is
 unregistered or dies.

The UI test automation service was not removed from the list of
enabled and installed service where it was explicitly added on
registration. This was leaving the accessibility manager service
in an inconsistent state.

bug:8185435

Change-Id: Ice17cdef361fe98ce34f8dd01ec11dbad6c4d0c2
---
 .../server/accessibility/AccessibilityManagerService.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index e6cabdc29d0d8..e5cba625e4d3f 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2105,6 +2105,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                 if (mIsAutomation) {
                     // We no longer have an automation service, so restore
                     // the state based on values in the settings database.
+                    userState.mInstalledServices.remove(mAccessibilityServiceInfo);
+                    userState.mEnabledServices.remove(mComponentName);
                     userState.mUiAutomationService = null;
                     userState.mUiAutomationServiceClient = null;
                 }