Merge "Abstract ZygoteInit.maybePreload call for webview." (1dbb3f11) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/WebViewZygoteInit.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -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

+5 −1

Original line number	Diff line number	Diff line
		@@ -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");
		}