Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "system-server-images" into sc-dev am: 8e8cb4cb1f

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114536

Change-Id: I1fef6fc2df1d99871d1d58f1fbe6414b93655751
This commit is contained in:
Orion Hodson
2021-06-29 16:11:12 +00:00
committed by Automerger Merge Worker
parent 44a1cece34 8e8cb4cb1f
commit f4c1648528
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -1632,7 +1632,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
if (is_system_server) {
// Prefetch the classloader for the system server. This is done early to
// allow a tie-down of the proper system server selinux domain.
env->CallStaticVoidMethod(gZygoteInitClass, gGetOrCreateSystemServerClassLoader);
env->CallStaticObjectMethod(gZygoteInitClass, gGetOrCreateSystemServerClassLoader);
if (env->ExceptionCheck()) {
// Be robust here. The Java code will attempt to create the classloader
// at a later point (but may not have rights to use AoT artifacts).