Merge "Add null-pointer check for the case where we have no WebView provider."

2015-12-17 18:04:37 +00:00
parent 5e044fb620 6ced4c95f5
commit 63196c5f82
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -710,6 +710,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
            IWebViewUpdateService.Stub.asInterface(ServiceManager.getService("webviewupdate"));
        try {
            WebViewProviderInfo[] providers = webViewUpdateService.getValidWebViewPackages();
+            if (providers == null) {
+                Log.e(TAG, "No WebView providers available");
+                return;
+            }
            String[] options = new String[providers.length];
            String[] values = new String[providers.length];
            for(int n = 0; n < providers.length; n++) {