commit a0295213181f3a0040a1407369e482ca260ed9eb
author Nicolas Geoffray <ngeoffray@google.com> Mon Feb 14 12:25:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 14 12:25:46 2022 +0000
tree 619e668979560fcb99f71be0894b9cbb58d587ec
parent 247988066c00594ba1b1f8327c38e21b1785d6dd
parent e032bc4139b1d740a0d0876f6c0bdcfe9160010d

Merge "Call the right JNI helper." am: e032bc4139

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

Change-Id: I23c51a4c7c7372b9aa6fadc4c979b8e6ee7d6b4a

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();
         }