diff --git a/core/java/com/android/internal/os/WebViewZygoteInit.java b/core/java/com/android/internal/os/WebViewZygoteInit.java index a8a55499f5f3c..12d699d2ae153 100644 --- a/core/java/com/android/internal/os/WebViewZygoteInit.java +++ b/core/java/com/android/internal/os/WebViewZygoteInit.java @@ -53,6 +53,11 @@ class WebViewZygoteInit { super(socket, abiList); } + @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 diff --git a/core/java/com/android/internal/os/ZygoteConnection.java b/core/java/com/android/internal/os/ZygoteConnection.java index e9e642a58a333..345350cc45fbd 100644 --- a/core/java/com/android/internal/os/ZygoteConnection.java +++ b/core/java/com/android/internal/os/ZygoteConnection.java @@ -171,7 +171,7 @@ class ZygoteConnection { return handleAbiListQuery(); } - ZygoteInit.maybePreload(); + maybePreload(); if (parsedArgs.preloadPackage != null) { return handlePreloadPackage(parsedArgs.preloadPackage, @@ -279,6 +279,10 @@ class ZygoteConnection { } } + protected void maybePreload() { + ZygoteInit.maybePreload(); + } + protected boolean handlePreloadPackage(String packagePath, String libsPath) { throw new RuntimeException("Zyogte does not support package preloading"); }