diff options
| author | Kenny Root <kroot@android.com> | 2010-04-21 20:06:51 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-04-21 20:06:51 -0700 |
| commit | 392fc3573553b71dc5c2712aca16e262efd33ce9 (patch) | |
| tree | 381b2cfcda29ed229fcef9a3c3a1487e816c8c81 | |
| parent | 5a870fee53ca94c7575503c72574ca0f068d52c7 (diff) | |
| parent | bdc7f891cf47c077c26ef418dbea23c04820c152 (diff) | |
| download | frameworks_base-392fc3573553b71dc5c2712aca16e262efd33ce9.zip frameworks_base-392fc3573553b71dc5c2712aca16e262efd33ce9.tar.gz frameworks_base-392fc3573553b71dc5c2712aca16e262efd33ce9.tar.bz2 | |
Merge "Fix broken logic in SettingsProvider.parseProviderList."
| -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 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()) { |