Merge "Delay starting the webview_zygote until first use." am: 6d9d717ab7

am: 99440a0ab8

Change-Id: Icf9297f730bc4fa779d989eccc05e436c5d463b6

core/java/android/webkit/WebViewZygote.java

@@ -93,13 +93,11 @@ public class WebViewZygote {
         synchronized (sLock) {
             sMultiprocessEnabled = enabled;
 
-            // When toggling between multi-process being on/off, start or stop the
-            // zygote. If it is enabled and the zygote is not yet started, launch it.
-            // Otherwise, kill it. The name may be null if the package information has
-            // not yet been resolved.
-            if (enabled) {
-                connectToZygoteIfNeededLocked();
-            } else {
+            // When multi-process is disabled, kill the zygote. When it is enabled,
+            // the zygote is not explicitly started here to avoid waiting on the
+            // zygote launch at boot. Instead, the zygote will be started when it is
+            // first needed in getProcess().
+            if (!enabled) {
                 stopZygoteLocked();
             }
         }