Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc7f891 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Fix broken logic in SettingsProvider.parseProviderList. 



We were accidentally stripping both leading and trailing commas
when removing a provider from the enabled provider list.

Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent e3491b6b

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+6 −3
Original line number Diff line number Diff line
@@ -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()) {