am 84cdf110: Merge "Avoid method overriding if its super method is inaccessible."

* commit '84cdf1103122aaef5d3969a7b02f3d1965a894c6':
  Avoid method overriding if its super method is inaccessible.

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);
         }
     }