commit a5e07fc5fd8172296381d7674e8e599abc71a4f7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 01 17:52:07 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 01 17:52:07 2024 +0000
tree 0252e881f3920361eb1dc49d5bfa1a6980f9a718
parent 22f8afbbe9e50b9ef63922f41b6e6329694c404a
parent 3951ad9780ab63728527970550ec15584d89f98d

Merge "Give WebViewZygote process shared app GID." into main

core/java/android/webkit/WebViewZygote.java

diff --git a/core/java/android/webkit/WebViewZygote.java b/core/java/android/webkit/WebViewZygote.java
index c7900e4..668cd01 100644
--- a/core/java/android/webkit/WebViewZygote.java
+++ b/core/java/android/webkit/WebViewZygote.java
@@ -22,6 +22,7 @@
 import android.os.Build;
 import android.os.ChildZygoteProcess;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.ZygoteProcess;
 import android.text.TextUtils;
 import android.util.Log;
@@ -141,12 +142,14 @@
             String abi = sPackage.applicationInfo.primaryCpuAbi;
             int runtimeFlags = Zygote.getMemorySafetyRuntimeFlagsForSecondaryZygote(
                     sPackage.applicationInfo, null);
+            final int[] sharedAppGid = {
+                    UserHandle.getSharedAppGid(UserHandle.getAppId(sPackage.applicationInfo.uid)) };
             sZygote = Process.ZYGOTE_PROCESS.startChildZygote(
                     "com.android.internal.os.WebViewZygoteInit",
                     "webview_zygote",
                     Process.WEBVIEW_ZYGOTE_UID,
                     Process.WEBVIEW_ZYGOTE_UID,
-                    null,  // gids
+                    sharedAppGid,  // Access to shared app GID for ART profiles
                     runtimeFlags,
                     "webview_zygote",  // seInfo
                     abi,  // abi