Merge "Don't show disabled packages in the WebView implementation Dev setting." into nyc-dev
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 8ae5888..943a4e6 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -766,22 +766,24 @@
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;
}