diff options
| -rw-r--r-- | services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java index b3c8b0b3a47a..27c80c43cd94 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl2.java @@ -107,15 +107,20 @@ class WebViewUpdateServiceImpl2 implements WebViewUpdateServiceInterface { mContext = context; mSystemInterface = systemInterface; WebViewProviderInfo[] webviewProviders = getWebViewPackages(); + + WebViewProviderInfo defaultProvider = null; for (WebViewProviderInfo provider : webviewProviders) { if (provider.availableByDefault) { - mDefaultProvider = provider; + defaultProvider = provider; break; } } - // This should be unreachable because the config parser enforces that there is at least one - // availableByDefault provider. - throw new AndroidRuntimeException("No available by default WebView Provider."); + if (defaultProvider == null) { + // This should be unreachable because the config parser enforces that there is at least + // one availableByDefault provider. + throw new AndroidRuntimeException("No available by default WebView Provider."); + } + mDefaultProvider = defaultProvider; } @Override |