commit 8bdf4e0d2094b7c9a9a1ffc1a58dbdff4cbe7126
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 25 17:24:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 25 17:24:42 2017 +0000
tree 9a9aa4e07fe83e56d8872831a3298aeecf58693c
parent 3d5aae73c9b2e8e700f477c2bf0246da997fb488
parent 5232be6bce00f63d406770d8169ae0c3d46f3f9f

Merge "ART: Remove RegisterNativeMethods special-casing"

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 2626eef..0fde41b 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -3057,7 +3057,8 @@
   if (c.get() == nullptr) {
     LOG(FATAL) << "Couldn't find class: " << jni_class_name;
   }
-  JNI::RegisterNativeMethods(env, c.get(), methods, method_count, false);
+  jint jni_result = env->RegisterNatives(c.get(), methods, method_count);
+  CHECK_EQ(JNI_OK, jni_result);
 }
 
 }  // namespace art