Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "System not checking if enabled services are installed when disabling accessibility."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-20 18:00:26 -07:00
committed by Android (Google) Code Review
parent a1d2790747 1e741b2705
commit 4a03e91aa0
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -718,8 +718,14 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
*/ */
private void manageServicesLocked() { private void manageServicesLocked() {
populateEnabledServicesLocked(mEnabledServices); populateEnabledServicesLocked(mEnabledServices);
updateServicesStateLocked(mInstalledServices, mEnabledServices); final int enabledInstalledServicesCount = updateServicesStateLocked(mInstalledServices,
disableAccessibilityIfNoEnabledServices(mEnabledServices); mEnabledServices);
// No enabled installed services => disable accessibility to avoid
// sending accessibility events with no recipient across processes.
if (mIsAccessibilityEnabled && enabledInstalledServicesCount == 0) {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED, 0);
}
} }
/** /**
@@ -771,13 +777,15 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
* *
* @param installedServices All installed {@link AccessibilityService}s. * @param installedServices All installed {@link AccessibilityService}s.
* @param enabledServices The {@link ComponentName}s of the enabled services. * @param enabledServices The {@link ComponentName}s of the enabled services.
* @return The number of enabled installed services.
*/ */
private void updateServicesStateLocked(List<AccessibilityServiceInfo> installedServices, private int updateServicesStateLocked(List<AccessibilityServiceInfo> installedServices,
Set<ComponentName> enabledServices) { Set<ComponentName> enabledServices) {
Map<ComponentName, Service> componentNameToServiceMap = mComponentNameToServiceMap; Map<ComponentName, Service> componentNameToServiceMap = mComponentNameToServiceMap;
boolean isEnabled = mIsAccessibilityEnabled; boolean isEnabled = mIsAccessibilityEnabled;
int enabledInstalledServices = 0;
for (int i = 0, count = installedServices.size(); i < count; i++) { for (int i = 0, count = installedServices.size(); i < count; i++) {
AccessibilityServiceInfo installedService = installedServices.get(i); AccessibilityServiceInfo installedService = installedServices.get(i);
ComponentName componentName = ComponentName.unflattenFromString( ComponentName componentName = ComponentName.unflattenFromString(
@@ -790,6 +798,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
service = new Service(componentName, installedService, false); service = new Service(componentName, installedService, false);
} }
service.bind(); service.bind();
enabledInstalledServices++;
} else { } else {
if (service != null) { if (service != null) {
service.unbind(); service.unbind();
@@ -801,19 +810,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
} }
} }
} }
}
/** return enabledInstalledServices;
* 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);
}
} }
/** /**