commit a7d72dfded3437e05c303dc40d61248022eb048b
author Svetoslav <svetoslavganov@google.com> Wed Feb 13 23:48:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 13 23:50:37 2013 +0000
tree b0f0496b311568dbe2bcfdc74c2104da7c611277
parent 0a4b65e0792c7e5f5e8ce641a899ed06cfa1cf64
parent 7379a95a0bb6bf430eaf3b84ddb94e4172dd0eea

Merge "Proper clean up when Ui test automation service is unregistered or dies."

services/java/com/android/server/accessibility/AccessibilityManagerService.java

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index e6cabdc..e5cba62 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -2105,6 +2105,8 @@
                 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;
                 }