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

am 2453f611: Merge "Remove WebView library preloading mechanism."

Browse Source 
* commit '2453f611d9b7c60c4ae9766b4bad42b9e1d13777':
  Remove WebView library preloading mechanism.
This commit is contained in:
Marcin Kosiba
2014-09-01 09:13:35 +00:00
committed by Android Git Automerger
parent 23f6a4ab5d 2453f611d9
commit f524961949
2 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,17 +36,6 @@ public final class WebViewFactory {
private static final boolean DEBUG = false; 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 // Cache the factory both for efficiency, and ensure any one process gets all webviews from the
// same provider. // same provider.
private static WebViewFactoryProvider sProviderInstance; private static WebViewFactoryProvider sProviderInstance;
@@ -88,15 +77,6 @@ public final class WebViewFactory {
throw new AndroidRuntimeException(e); 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(); StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
try { try {
sProviderInstance = providerClass.newInstance(); sProviderInstance = providerClass.newInstance();

1
preloaded-classes
View File

@@ -1222,7 +1222,6 @@ android.webkit.WebView$PrivateAccess
android.webkit.WebViewClient android.webkit.WebViewClient
android.webkit.WebViewDatabase android.webkit.WebViewDatabase
android.webkit.WebViewFactory android.webkit.WebViewFactory
android.webkit.WebViewFactory$Preloader
android.webkit.WebViewFactoryProvider android.webkit.WebViewFactoryProvider
android.webkit.WebViewFactoryProvider$Statics android.webkit.WebViewFactoryProvider$Statics
android.webkit.WebViewProvider android.webkit.WebViewProvider