commit 17c2e0e605234bbdfb8e8f815dc7f4365966d96f
author Svetoslav <svetoslavganov@google.com> Wed May 08 15:05:28 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 08 15:05:28 2013 -0700
tree 9fbc3edaa6b34d580f063ba1919fe488b963ca7a
parent 3c573d3af56174011235d585415f110e9c4dec14
parent 6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5

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

* commit '6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5':
  Settings crashing if there are no installed accessibility services.

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index bd802cf..6eb8e67 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -579,11 +579,16 @@
     }
 
     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();