diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-04-21 18:24:57 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-12-01 21:49:58 -0500 |
| commit | d43c1492034724e6a5e11f7af628d2b46fc28f61 (patch) | |
| tree | 82c9317c6205017faef26a97a9f8e70ae711b776 | |
| parent | 9196970fc8f503dcab546ca86f3c560bbf4590d6 (diff) | |
| download | frameworks_base-d43c1492034724e6a5e11f7af628d2b46fc28f61.zip frameworks_base-d43c1492034724e6a5e11f7af628d2b46fc28f61.tar.gz frameworks_base-d43c1492034724e6a5e11f7af628d2b46fc28f61.tar.bz2 | |
Fix broken logic in SettingsProvider.parseProviderList.
We were accidentally stripping both leading and trailing commas
when removing a provider from the enabled provider list.
Signed-off-by: Mike Lockwood <lockwood@android.com>
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 5434694..2e95932 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -403,9 +403,12 @@ public class SettingsProvider extends ContentProvider { } } else if (prefix == '-' && index >= 0) { // remove the provider from the list if present - // remove leading and trailing commas - if (index > 0) index--; - if (end < providers.length()) end++; + // remove leading or trailing comma + if (index > 0) { + index--; + } else if (end < providers.length()) { + end++; + } newProviders = providers.substring(0, index); if (end < providers.length()) { |