commit 63196c5f8211334486ab8e152eede72fbe6cfd6b
author Gustav Sennton <gsennton@google.com> Thu Dec 17 18:04:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 17 18:04:37 2015 +0000
tree cdc9d2635649a277633498ae3b22ae65d228ac30
parent 5e044fb620293411bd6e488dbe253045fefb43ba
parent 6ced4c95f590629311998ed5051534b9a3c26d5b

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

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c6f57ec..70d50b0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -710,6 +710,10 @@
             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++) {