Merge "Disable accessibility if all accessibility serivces are disbaled."

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

@@ -225,7 +225,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
                     return false;
                 }
             }
-            
+
             @Override
             public void onReceive(Context context, Intent intent) {
                 if (intent.getAction() == Intent.ACTION_BOOT_COMPLETED) {
@@ -697,6 +697,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
     private void manageServicesLocked() {
         populateEnabledServicesLocked(mEnabledServices);
         updateServicesStateLocked(mInstalledServices, mEnabledServices);
+        disableAccessibilityIfNoEnabledServices(mEnabledServices);
     }
 
     /**
@@ -780,6 +781,19 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
         }
     }
 
+    /**
+     * Disables accessibility if there are no enabled accessibility services which
+     * to consume the generated accessibility events.
+     *
+     * @param enabledServices The set of enabled services.
+     */
+    private void disableAccessibilityIfNoEnabledServices(Set<ComponentName> enabledServices) {
+        if (enabledServices.isEmpty()) {
+            Settings.Secure.putInt(mContext.getContentResolver(),
+                    Settings.Secure.ACCESSIBILITY_ENABLED, 0);
+        }
+    }
+
     /**
      * Sends the state to the clients.
      */