Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP."

Browse Source 
* commit '25d928f687408058f007051878574ea66691d9dc':
  Update WebViewFactory.java to compile in AOSP.
This commit is contained in:
Marcin Kosiba
2014-09-01 09:13:45 +00:00
committed by Android Git Automerger
parent 0b0c8c0a26 25d928f687
commit b1ad72c484
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,11 @@ public final class WebViewFactory {
return false; // User has not modifed Developer Settings return false; // User has not modifed Developer Settings
} }
public static String getWebViewPackageName() {
// TODO: Make this dynamic based on resource configuration.
return "com.android.webview";
}
static WebViewFactoryProvider getProvider() { static WebViewFactoryProvider getProvider() {
synchronized (sProviderLock) { synchronized (sProviderLock) {
// For now the main purpose of this function (and the factory abstraction) is to keep // For now the main purpose of this function (and the factory abstraction) is to keep
@@ -103,8 +108,7 @@ public final class WebViewFactory {
return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, true, return (Class<WebViewFactoryProvider>) Class.forName(CHROMIUM_WEBVIEW_FACTORY, true,
clazzLoader); clazzLoader);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.e(LOGTAG, "Chromium WebView package does not exist"); throw new ClassNotFoundException("Chromium WebView package does not exist", e);
return (Class<WebViewFactoryProvider>) Class.forName(NULL_WEBVIEW_FACTORY);
} }
} }
} }