diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-22 13:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-22 13:25:14 -0700 |
| commit | 2b32afd07da2319c4d55624332cee1a43a56cf47 (patch) | |
| tree | 9f656dbad3c27cd05ad5eac8ff2ddd3b7192d3a2 /packages/SettingsProvider | |
| parent | 077952f73e5966c077cd71975125119df7c8125d (diff) | |
| parent | 5ebaf10693725c9dc48219c3c65945b84d74692f (diff) | |
| download | frameworks_base-2b32afd07da2319c4d55624332cee1a43a56cf47.zip frameworks_base-2b32afd07da2319c4d55624332cee1a43a56cf47.tar.gz frameworks_base-2b32afd07da2319c4d55624332cee1a43a56cf47.tar.bz2 | |
am 5ebaf106: merge from open-source master
Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken
* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
Fix broken logic in SettingsProvider.parseProviderList.
Diffstat (limited to 'packages/SettingsProvider')
| -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 1b4ba81..1019fa8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -399,9 +399,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()) { |