Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bc38eda authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

Only start WebView zygote if multiprocess enabled. 

The fix for b/130305037 inadvertantly changed the behaviour of the
webview zygote for devices which have multiprocess WebView disabled: the
zygote was being started at boot time even if it would not be needed.

Only call the function to start the zygote if multiprocess is actually
enabled, to fix this.

Fixes: 131267737
Test: adb shell cmd webviewupdate disable-multiprocess; adb reboot
Change-Id: Iccda48b75d75259821dba6b002339b2d6c8e3394
parent aeb929a3

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

+5 −2
Original line number Diff line number Diff line
@@ -81,9 +81,12 @@ public class WebViewUpdateServiceImpl { 
    void prepareWebViewInSystemServer() {

        migrateFallbackStateOnBoot();

        mWebViewUpdater.prepareWebViewInSystemServer();

        mSystemInterface.notifyZygote(isMultiProcessEnabled());

        boolean multiProcessEnabled = isMultiProcessEnabled();

        mSystemInterface.notifyZygote(multiProcessEnabled);

        if (multiProcessEnabled) {

            AsyncTask.THREAD_POOL_EXECUTOR.execute(this::startZygoteWhenReady);

        }

    }



    void startZygoteWhenReady() {

        // Wait on a background thread for RELRO creation to be done. We ignore the return value