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

am 5ebaf106: merge from open-source master

Browse Source 
Merge commit '5ebaf10693725c9dc48219c3c65945b84d74692f' into kraken

* commit '5ebaf10693725c9dc48219c3c65945b84d74692f':
  Fix broken logic in SettingsProvider.parseProviderList.
This commit is contained in:
The Android Open Source Project
2010-04-22 13:25:14 -07:00
committed by Android Git Automerger
parent 077952f73e 5ebaf10693
commit 2b32afd07d
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

@@ -399,9 +399,12 @@ public class SettingsProvider extends ContentProvider {
} }
} else if (prefix == '-' && index >= 0) { } else if (prefix == '-' && index >= 0) {
// remove the provider from the list if present // remove the provider from the list if present
// remove leading and trailing commas // remove leading or trailing comma
if (index > 0) index--; if (index > 0) {
if (end < providers.length()) end++; index--;
} else if (end < providers.length()) {
end++;
}
newProviders = providers.substring(0, index); newProviders = providers.substring(0, index);
if (end < providers.length()) { if (end < providers.length()) {