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

Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-15 18:48:55 -07:00
committed by Android (Google) Code Review
parent bf118ffba7 efe27bfcdb
commit f506cb958d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/AccessibilitySettings.java
View File

@@ -84,7 +84,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// the AccessibilityServiceInfo we need for proper presentation. // the AccessibilityServiceInfo we need for proper presentation.
private static final long DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS = 1000; private static final long DELAY_UPDATE_SERVICES_PREFERENCES_MILLIS = 1000;
private static final char ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ':'; private static final String ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR = ":";
private static final String KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE = private static final String KEY_ACCESSIBILITY_TUTORIAL_LAUNCHED_ONCE =
"key_accessibility_tutorial_launched_once"; "key_accessibility_tutorial_launched_once";
@@ -126,7 +126,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Auxiliary members. // Auxiliary members.
private final SimpleStringSplitter mStringColonSplitter = private final SimpleStringSplitter mStringColonSplitter =
new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR); new SimpleStringSplitter(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR.charAt(0));
private final Map<String, String> mLongPressTimeoutValuetoTitleMap = private final Map<String, String> mLongPressTimeoutValuetoTitleMap =
new HashMap<String, String>(); new HashMap<String, String>();
@@ -572,6 +572,11 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
if (enabledServices == null) { if (enabledServices == null) {
enabledServices = ""; enabledServices = "";
} }
// Due to a legacy bug we can get an enabled services value ending with a
// separator. Make sure to catch and fix that before handling.
if (enabledServices.endsWith(ENABLED_ACCESSIBILITY_SERVICES_SEPARATOR)) {
enabledServices = enabledServices.substring(0, enabledServices.length() - 1);
}
final int length = enabledServices.length(); final int length = enabledServices.length();
if (enabled) { if (enabled) {
if (enabledServices.contains(preferenceKey)) { if (enabledServices.contains(preferenceKey)) {