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

Merge "(cherrypick from master) 3322879 Device soft reboots on enabling and disabling accessibility settings" into honeycomb

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-01-06 17:55:31 -08:00
committed by Android (Google) Code Review
parent 32846944e9 563d78401d
commit 8303dccf2b
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/AccessibilityManagerService.java
View File

@@ -532,11 +532,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
for (int i = 0, count = services.size(); i < count; i++) {
Service service = services.get(i);
service.unbind();
mComponentNameToServiceMap.remove(service.mComponentName);
}
services.clear();
}
/**
@@ -588,15 +585,18 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
Service service = componentNameToServiceMap.get(componentName);
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();
if (enabledServices.contains(componentName)) {
if (service == null) {
service = new Service(componentName);
}
service.bind();
} else if (!enabledServices.contains(componentName)) {
if (service != null) {
service.unbind();
}
}
} else {
if (service != null) {
// clean up done in Service#onServiceDisconnected
service.unbind();
}
}
@@ -679,6 +679,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
public void unbind() {
if (mService != null) {
mContext.unbindService(this);
mComponentNameToServiceMap.remove(mComponentName);
mServices.remove(this);
}
}