commit 13e748b28c5f2bd1e83674d2ca899ff61ae5c0a1
author Jeff Hao <jeffhao@google.com> Tue Aug 25 20:44:19 2015 +0000
committer Jeff Hao <jeffhao@google.com> Tue Aug 25 14:20:09 2015 -0700
tree 387724eebfe7cd0f7be368e64b22af3894eea4c7
parent dda43e7e9680e6eead02876e67718d01837d89e0

Revert "Revert "Move annotations to native.""

This reverts commit 7db6dd79a24570448ae737ee1946b00396696cac.

Adds check if field's declaring class is proxy.
Bug: 23508574

Change-Id: Ie829f1526e74427711e818b56d1588d92946cbf6

runtime/mirror/class.h

diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index cbcb517..ef257ae 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -831,6 +831,9 @@
                                        size_t pointer_size)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
+  ArtMethod* FindDeclaredVirtualMethodByName(const StringPiece& name, size_t pointer_size)
+      SHARED_REQUIRES(Locks::mutator_lock_);
+
   ArtMethod* FindVirtualMethod(const StringPiece& name, const StringPiece& signature,
                                size_t pointer_size)
       SHARED_REQUIRES(Locks::mutator_lock_);