Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e554395 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

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

parents 2c766ba5 084fbc81

src/com/android/settings/AccessibilitySettings.java

+7 −2
Original line number Diff line number Diff line
@@ -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();