3304011 At times Talkback still works after disabling it.
Change-Id: If99ef28c6285a2d290d46518a07d69d5e22cca5b
diff --git a/services/java/com/android/server/AccessibilityManagerService.java b/services/java/com/android/server/AccessibilityManagerService.java
index d38522c..77b6dd0 100644
--- a/services/java/com/android/server/AccessibilityManagerService.java
+++ b/services/java/com/android/server/AccessibilityManagerService.java
@@ -587,15 +587,17 @@
intalledService.name);
Service service = componentNameToServiceMap.get(componentName);
- if (isEnabled && enabledServices.contains(componentName)) {
- if (service == null) {
+ if (isEnabled) {
+ if (enabledServices.contains(componentName) && service == null) {
new Service(componentName).bind();
+ } else if (!enabledServices.contains(componentName) && service != null) {
+ // clean up done in Service#onServiceDisconnected
+ service.unbind();
}
} else {
if (service != null) {
+ // clean up done in Service#onServiceDisconnected
service.unbind();
- componentNameToServiceMap.remove(componentName);
- services.remove(service);
}
}
}