Merge "3304011 At times Talkback still works after disabling it." (03c5dd91) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -587,15 +587,17 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
		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);
		}
		}
		}