am 2436ea18: am 90d3e3b3: Merge "Add test cases for concurrent gc and System.arraycopy"

* commit '2436ea181dc24ec4d91a6052394d24bf60987f25':
  Add test cases for concurrent gc and System.arraycopy

diff --git a/vm/reflect/Annotation.cpp b/vm/reflect/Annotation.cpp
index 233db08..bd18a80 100644 (file)
--- a/vm/reflect/Annotation.cpp
+++ b/vm/reflect/Annotation.cpp
@@ -679,7 +679,7 @@ static Object* createAnnotationMember(const ClassObject* clazz,
             ALOGW("WARNING: could not find annotation member %s in %s",
                 name, annoClass->descriptor);
         } else {
-            methodObj = dvmCreateReflectMethodObject(annoMeth);
+            methodObj = dvmCreateReflectObjForMethod(annoClass, annoMeth);
             methodReturn = dvmGetBoxedReturnType(annoMeth);
         }
     }