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

Commit 4b616f7e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix JNI error" am: 25055eb9 am: 809117b7 am: ba22d7aa 

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

Change-Id: I0fa6cb16f12278fbee628a0a30adc776c8697a6b
parents 36d7bc8f ba22d7aa

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,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).