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

Merge "Fix JNI error" am: 25055eb9b6 am: 809117b7fb am: ba22d7aa3b

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

Change-Id: I0fa6cb16f12278fbee628a0a30adc776c8697a6b
This commit is contained in:
Treehugger Robot
2021-06-29 10:14:04 +00:00
committed by Automerger Merge Worker
parent 36d7bc8fd6 ba22d7aa3b
commit 4b616f7ea5
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

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