am 7e554395: Merge "Settings crashing if there are no installed accessibility services." into jb-mr2-dev

* commit '7e554395cbf3d3c1043e99fb080bd9148832c225':
  Settings crashing if there are no installed accessibility services.
This commit is contained in:
Svetoslav
2013-05-08 14:37:00 -07:00
committed by Android Git Automerger

View File

@@ -570,11 +570,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
}
private void loadInstalledServices() {
Set<ComponentName> installedServices = sInstalledServices;
installedServices.clear();
List<AccessibilityServiceInfo> installedServiceInfos =
AccessibilityManager.getInstance(getActivity())
.getInstalledAccessibilityServiceList();
Set<ComponentName> installedServices = sInstalledServices;
installedServices.clear();
if (installedServiceInfos == null) {
return;
}
final int installedServiceInfoCount = installedServiceInfos.size();
for (int i = 0; i < installedServiceInfoCount; i++) {
ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();