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

Commit f4c16485 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I1fef6fc2df1d99871d1d58f1fbe6414b93655751
parents 44a1cece 8e8cb4cb

core/jni/com_android_internal_os_Zygote.cpp

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