diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-02 15:21:54 +0100 |
|---|---|---|
| committer | Marcin Kosiba <mkosiba@google.com> | 2014-08-05 09:26:54 +0100 |
| commit | 3d9bcc066f75ec2b4de868df5d5864cceb8024c5 (patch) | |
| tree | c3a9c1958ce9a2698896e998dee1579edeb35b2b /core/java/android/webkit | |
| parent | 20bac14e521dd551addd8541380f1d9b6c910bd2 (diff) | |
| download | frameworks_base-3d9bcc066f75ec2b4de868df5d5864cceb8024c5.zip frameworks_base-3d9bcc066f75ec2b4de868df5d5864cceb8024c5.tar.gz frameworks_base-3d9bcc066f75ec2b4de868df5d5864cceb8024c5.tar.bz2 | |
Remove WebView library preloading mechanism.
We don't want to preload the WebView library in the zygote process any
more, as loading an updatable WebView in the zygote is a stability risk.
The memory benefits of preloading will be obtained in other ways.
Bug: 13005501
Change-Id: Ic89f2a1d057dc92b01fb775bf326b47ac2d4caa2
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebViewFactory.java | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index b9131bf..f694c2f 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -36,17 +36,6 @@ public final class WebViewFactory { private static final boolean DEBUG = false; - private static class Preloader { - static WebViewFactoryProvider sPreloadedProvider; - static { - try { - sPreloadedProvider = getFactoryClass().newInstance(); - } catch (Exception e) { - Log.w(LOGTAG, "error preloading provider", e); - } - } - } - // Cache the factory both for efficiency, and ensure any one process gets all webviews from the // same provider. private static WebViewFactoryProvider sProviderInstance; @@ -88,15 +77,6 @@ public final class WebViewFactory { throw new AndroidRuntimeException(e); } - // This implicitly loads Preloader even if it wasn't preloaded at boot. - if (Preloader.sPreloadedProvider != null && - Preloader.sPreloadedProvider.getClass() == providerClass) { - sProviderInstance = Preloader.sPreloadedProvider; - if (DEBUG) Log.v(LOGTAG, "Using preloaded provider: " + sProviderInstance); - return sProviderInstance; - } - - // The preloaded provider isn't the one we wanted; construct our own. StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads(); try { sProviderInstance = providerClass.newInstance(); |