summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2022-02-14 12:43:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-14 12:43:56 +0000
commit21e85559f40645fac5935fffcdc5691fc6e52ad2 (patch)
treee0d44bb0ef7b5625725fc048d50d5dfcb3268291
parentc8d4c8faf8efd3616db2d1348a5e4233b29f9a2c (diff)
parenta0295213181f3a0040a1407369e482ca260ed9eb (diff)
Merge "Call the right JNI helper." am: e032bc4139 am: a029521318
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1984966 Change-Id: I89ef86a02751c9f591b725c9a693cca6bd44f225
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 5efc4db52623..597167026d19 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1626,7 +1626,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
}
// 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();
}