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

Commit 14cf92a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Give WebViewZygote process shared app GID." into main am: a5e07fc5 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3288748



Change-Id: I10d43d131906768ed20790d9b05740e50e576f9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2e743f7 a5e07fc5

core/java/android/webkit/WebViewZygote.java

+4 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.pm.PackageInfo; 
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 @@ public class WebViewZygote { 
            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