commit d2e743f77c901827eb31546f332576f1274767d1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 01 18:10:50 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 01 18:10:50 2024 +0000
tree 071e5c215578d68e3339b2051d97253eb1ca14f9
parent fa2a08359dc24678af79ac734b0a82f100d9b37d
parent 22f8afbbe9e50b9ef63922f41b6e6329694c404a

Merge "Give AppZygote process shared app GID." into main am: 22f8afbbe9

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

Change-Id: I2bf40ae6f30b63f4d385bb6ebedb8061dcb091bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/os/AppZygote.java

diff --git a/core/java/android/os/AppZygote.java b/core/java/android/os/AppZygote.java
index 07fbe4a..0541a96 100644
--- a/core/java/android/os/AppZygote.java
+++ b/core/java/android/os/AppZygote.java
@@ -111,12 +111,15 @@
         try {
             int runtimeFlags = Zygote.getMemorySafetyRuntimeFlagsForSecondaryZygote(
                     mAppInfo, mProcessInfo);
+
+            final int[] sharedAppGid = {
+                    UserHandle.getSharedAppGid(UserHandle.getAppId(mAppInfo.uid)) };
             mZygote = Process.ZYGOTE_PROCESS.startChildZygote(
                     "com.android.internal.os.AppZygoteInit",
                     mAppInfo.processName + "_zygote",
                     mZygoteUid,
                     mZygoteUid,
-                    null,  // gids
+                    sharedAppGid,  // Zygote gets access to shared app GID for profiles
                     runtimeFlags,
                     "app_zygote",  // seInfo
                     abi,  // abi