merge from open-source master

Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
This commit is contained in:
The Android Open Source Project
2010-04-22 11:43:17 -07:00

View File

@ -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()) {