am 03b976ac: am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev automerge: 026c1ac

* commit '03b976ac7bfc1eafb6c5fc11ebd19fabb90d8368':
  Prevent NPE when no accessibility services are enabled
This commit is contained in:
Alan Viverette
2014-10-17 18:16:54 +00:00
committed by Android Git Automerger

View File

@@ -194,9 +194,10 @@ public class ToggleAccessibilityServicePreferenceFragment
}
private void updateSwitchBarToggleSwitch() {
String settingValue = Settings.Secure.getString(getContentResolver(),
final String settingValue = Settings.Secure.getString(getContentResolver(),
Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
final boolean checked = settingValue.contains(mComponentName.flattenToString());
final boolean checked = settingValue != null
&& settingValue.contains(mComponentName.flattenToString());
mSwitchBar.setCheckedInternal(checked);
}