commit d2bba56367cb154caf03b76853341ddfed3b1cd1
author The Android Open Source Project <initial-contribution@android.com> Thu Jun 07 07:52:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 07 07:52:09 2012 -0700
tree ff13d9bdaefe93092487454cab511871c64f32e2
parent c8ae7db82bc8d2dda9996fe3060dcfe5eed982f2
parent 411b853adfa971ca58c7cb6ac1896206085814e6

am 411b853a: Reconcile with jb-release

* commit '411b853adfa971ca58c7cb6ac1896206085814e6':

vm/reflect/Annotation.cpp

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