diff options
author | Svetoslav <svetoslavganov@google.com> | 2013-08-08 12:35:36 -0700 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2013-08-08 12:37:48 -0700 |
commit | 3f257c4dfba2acc2d61b91baf4f69524a1dc02af (patch) | |
tree | 359ccbd0be9b746236dfaefe9c5b479e45f82ad3 /src/com/android/settings/accessibility | |
parent | 88afb32fc6422139dcf8340aa88f3de9112a1485 (diff) | |
download | packages_apps_Settings-3f257c4dfba2acc2d61b91baf4f69524a1dc02af.zip packages_apps_Settings-3f257c4dfba2acc2d61b91baf4f69524a1dc02af.tar.gz packages_apps_Settings-3f257c4dfba2acc2d61b91baf4f69524a1dc02af.tar.bz2 |
Fix a crash in accessibiility settings.
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
Diffstat (limited to 'src/com/android/settings/accessibility')
-rw-r--r-- | src/com/android/settings/accessibility/AccessibilityUtils.java | 3 | ||||
-rw-r--r-- | src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/settings/accessibility/AccessibilityUtils.java b/src/com/android/settings/accessibility/AccessibilityUtils.java index 66a3ed2..7282bce 100644 --- a/src/com/android/settings/accessibility/AccessibilityUtils.java +++ b/src/com/android/settings/accessibility/AccessibilityUtils.java @@ -33,7 +33,8 @@ import java.util.Set; */ class AccessibilityUtils { /** - * @return the set of enabled accessibility services + * @return the set of enabled accessibility services. If there are not services + * it returned the unmodifiable {@link Collections#emptySet()}. */ static Set<ComponentName> getEnabledServicesFromSettings(Context context) { final String enabledServicesSetting = Settings.Secure.getString( diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 3059dcc..0c568f0 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -39,6 +39,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener; +import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -81,6 +83,10 @@ public class ToggleAccessibilityServicePreferenceFragment Set<ComponentName> enabledServices = AccessibilityUtils.getEnabledServicesFromSettings( getActivity()); + if (enabledServices == (Set<?>) Collections.emptySet()) { + enabledServices = new HashSet<ComponentName>(); + } + // Determine enabled services and accessibility state. ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey); boolean accessibilityEnabled = false; |