commit 9323e6e44060545d6c4f925139572868f65b7fe3
author David Sehr <sehr@google.com> Tue Sep 13 08:58:35 2016 -0700
committer David Sehr <sehr@google.com> Wed Sep 14 08:01:39 2016 -0700
tree 65f3f380605d75f34d49aec49fca494bec26ef5b
parent 58735fbfbb2da0c0a19b3239da07c2353c40767d

Separate annotations from dexfile reading.

Bug: 22322814
Change-Id: I867d66da407dd80394a10d19903ebbc1ec3986ff
Test: test-art

runtime/native/java_lang_reflect_Parameter.cc

diff --git a/runtime/native/java_lang_reflect_Parameter.cc b/runtime/native/java_lang_reflect_Parameter.cc
index 8fe3bb5..c2a803c 100644
--- a/runtime/native/java_lang_reflect_Parameter.cc
+++ b/runtime/native/java_lang_reflect_Parameter.cc
@@ -19,6 +19,7 @@
 #include "art_method-inl.h"
 #include "common_throws.h"
 #include "dex_file-inl.h"
+#include "dex_file_annotations.h"
 #include "jni_internal.h"
 #include "scoped_fast_native_object_access.h"
 #include "utils.h"
@@ -54,7 +55,7 @@
   StackHandleScope<1> hs(soa.Self());
   Handle<mirror::Class> klass(hs.NewHandle(soa.Decode<mirror::Class*>(annotationType)));
   return soa.AddLocalReference<jobject>(
-      method->GetDexFile()->GetAnnotationForMethodParameter(method, parameterIndex, klass));
+      annotations::GetAnnotationForMethodParameter(method, parameterIndex, klass));
 }
 
 static JNINativeMethod gMethods[] = {