Ensure zygote process is killed when webview provider changes
Test: Checked that webview is working after uninstalling from the playstore
Bug: 330762684
Bug: 308907090
Change-Id: I45f0a3c63c06e9fbe4b3a4f4e635dec29c5abe7f
diff --git a/core/java/android/webkit/WebViewZygote.java b/core/java/android/webkit/WebViewZygote.java
index e14ae72..c7900e4 100644
--- a/core/java/android/webkit/WebViewZygote.java
+++ b/core/java/android/webkit/WebViewZygote.java
@@ -104,7 +104,8 @@
sPackage = packageInfo;
// If multi-process is not enabled, then do not start the zygote service.
- if (!sMultiprocessEnabled) {
+ // Only check sMultiprocessEnabled if updateServiceV2 is not enabled.
+ if (!updateServiceV2() && !sMultiprocessEnabled) {
return;
}