commit 05474038051ffbe2f0bb0f42e005c9b732af7eac
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 14 12:59:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 12:59:57 2022 +0000
tree 61327f801387ce89a44b6a65785ef7e5e017f851
parent d6a5521d2ad7fa13c5481ec2ed368881edb549bd
parent 21e85559f40645fac5935fffcdc5691fc6e52ad2

Merge "Call the right JNI helper." am: e032bc4139 am: a029521318 am: 21e85559f4

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

Change-Id: I64772539c56e192e76b412048e94d8e7711eb403

core/jni/com_android_internal_os_Zygote.cpp

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 5efc4db..5971670 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1626,7 +1626,7 @@
         }
         // Also prefetch standalone system server jars. The reason for doing this here is the same
         // as above.
-        env->CallStaticObjectMethod(gZygoteInitClass, gPrefetchStandaloneSystemServerJars);
+        env->CallStaticVoidMethod(gZygoteInitClass, gPrefetchStandaloneSystemServerJars);
         if (env->ExceptionCheck()) {
             env->ExceptionClear();
         }