From bdc7f891cf47c077c26ef418dbea23c04820c152 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 21 Apr 2010 18:24:57 -0400 Subject: 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 --- .../src/com/android/providers/settings/SettingsProvider.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 9877342..ab186cf 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -305,9 +305,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()) { -- cgit v1.1