Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev

This commit is contained in:
Alan Viverette
2014-10-17 18:03:34 +00:00
committed by Android (Google) Code Review

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);
}