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

Commit b2e8d343 authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev

parents e4ebcd12 0851ede8
Loading
Loading
Loading
Loading
+10 −8
Original line number Diff line number Diff line
@@ -766,22 +766,24 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                Log.e(TAG, "No WebView providers available");
                return;
            }
            String[] options = new String[providers.length];
            String[] values = new String[providers.length];
            ArrayList<String> options = new ArrayList<String>();
            ArrayList<String> values = new ArrayList<String>();
            for(int n = 0; n < providers.length; n++) {
                options[n] = providers[n].description;
                values[n] = providers[n].packageName;
                if (isPackageEnabled(providers[n].packageName)) {
                    options.add(providers[n].description);
                    values.add(providers[n].packageName);
                }
            mWebViewProvider.setEntries(options);
            mWebViewProvider.setEntryValues(values);
            }
            mWebViewProvider.setEntries(options.toArray(new String[options.size()]));
            mWebViewProvider.setEntryValues(values.toArray(new String[values.size()]));

            String value = mWebViewUpdateService.getCurrentWebViewPackageName();
            if (value == null) {
                value = "";
            }

            for (int i = 0; i < values.length; i++) {
                if (value.contentEquals(values[i])) {
            for (int i = 0; i < values.size(); i++) {
                if (value.contentEquals(values.get(i))) {
                    mWebViewProvider.setValueIndex(i);
                    return;
                }