drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Murdoch
2014-05-19 11:26:31 +00:00
committed by Android (Google) Code Review
parent 45734b4ae1 0e04bcfbdc
commit 3011fc1aa7
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebViewFactory.java
View File

@ -32,6 +32,9 @@ public final class WebViewFactory {
private static final String CHROMIUM_WEBVIEW_FACTORY = private static final String CHROMIUM_WEBVIEW_FACTORY =
"com.android.webview.chromium.WebViewChromiumFactoryProvider"; "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 String LOGTAG = "WebViewFactory";
private static final boolean DEBUG = false; private static final boolean DEBUG = false;
@ -112,6 +115,11 @@ public final class WebViewFactory {
} }
private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException { private static Class<WebViewFactoryProvider> getFactoryClass() throws ClassNotFoundException {
try {
return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY); 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);
}
} }
} }