commit 3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c
author Ben Murdoch <benm@google.com> Mon May 19 11:26:31 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 19 11:26:33 2014 +0000
tree b46fbcfdf2b3247ec025e57de7e9bc1871af6c00
parent 45734b4ae180ea3c34f92575b3ed362bbf4f20e5
parent 0e04bcfbdc1845c931b45b3498aef438b944e961

Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev

core/java/android/webkit/WebViewFactory.java

diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java
index b9131bf..1379d18 100644
--- a/core/java/android/webkit/WebViewFactory.java
+++ b/core/java/android/webkit/WebViewFactory.java
@@ -32,6 +32,9 @@
     private static final String CHROMIUM_WEBVIEW_FACTORY =
             "com.android.webview.chromium.WebViewChromiumFactoryProvider";
 
+    private static final String NULL_WEBVIEW_FACTORY =
+            "com.android.webview.nullwebview.NullWebViewFactoryProvider";
+
     private static final String LOGTAG = "WebViewFactory";
 
     private static final boolean DEBUG = false;
@@ -112,6 +115,11 @@
     }
 
     private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException {
-        return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY);
+        try {
+            return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY);
+        } catch (ClassNotFoundException e) {
+            Log.e(LOGTAG, "Chromium WebView does not exist");
+            return (Class<WebViewFactoryProvider>) Class.forName(NULL_WEBVIEW_FACTORY);
+        }
     }
 }