From 6ced4c95f590629311998ed5051534b9a3c26d5b Mon Sep 17 00:00:00 2001
From: Gustav Sennton <gsennton@google.com>
Date: Thu, 17 Dec 2015 15:44:16 +0000
Subject: [PATCH] Add null-pointer check for the case where we have no WebView
 provider.

Change-Id: I33a142bd3af694dfe9c63e6852a6b5cd701de467
---
 src/com/android/settings/DevelopmentSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c6f57ec077c..70d50b0e692 100644
--- 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++) {