Merge "Abstract ZygoteInit.maybePreload call for webview."
diff --git a/core/java/com/android/internal/os/WebViewZygoteInit.java b/core/java/com/android/internal/os/WebViewZygoteInit.java
index a8a5549..12d699d 100644
--- a/core/java/com/android/internal/os/WebViewZygoteInit.java
+++ b/core/java/com/android/internal/os/WebViewZygoteInit.java
@@ -54,6 +54,11 @@
}
@Override
+ protected void maybePreload() {
+ // Do nothing, we don't need to call ZygoteInit.maybePreload() for the WebView zygote.
+ }
+
+ @Override
protected boolean handlePreloadPackage(String packagePath, String libsPath) {
// Ask ApplicationLoaders to create and cache a classloader for the WebView APK so that
// our children will reuse the same classloader instead of creating their own.
diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java
index e9e642a..345350c 100644
--- a/core/java/com/android/internal/os/ZygoteConnection.java
+++ b/core/java/com/android/internal/os/ZygoteConnection.java
@@ -171,7 +171,7 @@
return handleAbiListQuery();
}
- ZygoteInit.maybePreload();
+ maybePreload();
if (parsedArgs.preloadPackage != null) {
return handlePreloadPackage(parsedArgs.preloadPackage,
@@ -279,6 +279,10 @@
}
}
+ protected void maybePreload() {
+ ZygoteInit.maybePreload();
+ }
+
protected boolean handlePreloadPackage(String packagePath, String libsPath) {
throw new RuntimeException("Zyogte does not support package preloading");
}