diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java index bd802cf2730..6eb8e670c36 100644 --- a/src/com/android/settings/AccessibilitySettings.java +++ b/src/com/android/settings/AccessibilitySettings.java @@ -579,11 +579,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } private void loadInstalledServices() { + Set installedServices = sInstalledServices; + installedServices.clear(); + List installedServiceInfos = AccessibilityManager.getInstance(getActivity()) .getInstalledAccessibilityServiceList(); - Set 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();