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

3322879 Device soft reboots on enabling and disabling accessibility settings (caused due to my incorrect fix of 3304011 in change If99ef28c)

Browse Source 
Change-Id: I9578655b3b436829f0adb3947c242a19631d74c7
This commit is contained in:
Svetoslav Ganov
2011-01-05 13:38:58 -08:00
parent 5727b47982
commit cbfebb382b
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);
}
}