diff options
| author | Marcus Oakland <marcus.oakland@arm.com> | 2014-09-24 15:23:06 +0100 |
|---|---|---|
| committer | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-09-26 14:28:52 +0100 |
| commit | 51be0a7158b62d6da6a3ccb6fce9f7f677ec3ce3 (patch) | |
| tree | 3305d20fd3c3e497a6f775e8e600dd48aee938b1 /runtime/check_jni.cc | |
| parent | 70637e40f405fa75658b3ae6bf1863be2522a11f (diff) | |
| download | art-51be0a7158b62d6da6a3ccb6fce9f7f677ec3ce3.zip art-51be0a7158b62d6da6a3ccb6fce9f7f677ec3ce3.tar.gz art-51be0a7158b62d6da6a3ccb6fce9f7f677ec3ce3.tar.bz2 | |
Fix CallStaticVoidMethodA for testEverything
The android.jni.cts.JniCTest#testEverything and
android.jni.cts.JniCppTest#testEverything CTS test were failing
because of a SIGABRT caused by a call to ScopedCheck::AbortF
from ScopedCheck::CheckInstance when CheckJNI::CallStaticVoidMethodA
was invoked. This was due to the CheckJNI::CallMethodA method being
called with the jobject obj parameter being passed jclass c, and the
jclass c parameter being passed nullptr. This problem was rectified
by swapping these two parameters, and the CTS tests then passed.
Change-Id: I025cfd85ab55eb3eadb287b56846d9d42f5b7e5e
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Diffstat (limited to 'runtime/check_jni.cc')
| -rw-r--r-- | runtime/check_jni.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc index 95223d8..bfe44a2 100644 --- a/runtime/check_jni.cc +++ b/runtime/check_jni.cc @@ -1914,7 +1914,7 @@ class CheckJNI { } static void CallStaticVoidMethodA(JNIEnv* env, jclass c, jmethodID mid, jvalue* vargs) { - CallMethodA(__FUNCTION__, env, c, nullptr, mid, vargs, Primitive::kPrimVoid, kStatic); + CallMethodA(__FUNCTION__, env, nullptr, c, mid, vargs, Primitive::kPrimVoid, kStatic); } static void CallVoidMethodV(JNIEnv* env, jobject obj, jmethodID mid, va_list vargs) { |