PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2106c79b: Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev

Browse Source 
automerge: 026c1ac

* commit '026c1ac3e7a9f8d465a546c161eac464512cbc62':
  Prevent NPE when no accessibility services are enabled
This commit is contained in:
Alan Viverette
2014-10-17 18:12:11 +00:00
committed by android-build-merger
parent 27b64086fd 026c1ac3e7
commit 03b976ac7b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
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);
}