commit 6b8c7e7c33fbf7d6425baf7003222b7603ac8ef5
author Svetoslav <svetoslavganov@google.com> Wed May 08 14:37:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 08 14:37:00 2013 -0700
tree 5ed34a2115e36079b4fc1f6e47c2eb4bb4dcfdda
parent eb8e9c11ede066a7b28c51b3492ce7253304cb5b
parent 7e554395cbf3d3c1043e99fb080bd9148832c225

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.

src/com/android/settings/AccessibilitySettings.java

diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index a4438d0..ea4940e 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -570,11 +570,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();