Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix broken logic in SettingsProvider.parseProviderList."

Browse Source
This commit is contained in:
Kenny Root
2010-04-21 20:06:51 -07:00
committed by Android Code Review
parent 5a870fee53 bdc7f891cf
commit 392fc35735
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

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