PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav
2013-05-08 21:33:13 +00:00
committed by Android (Google) Code Review
parent 2c766ba56c 084fbc8107
commit 7e554395cb
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/AccessibilitySettings.java
View File

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