commit 3612149aee482ab7a17da68b0ef5fef3879729a2
author Alex Light <allight@google.com> Mon Feb 22 13:43:29 2016 -0800
committer Alex Light <allight@google.com> Tue Feb 23 13:24:05 2016 -0800
tree 42180a35266333cbf37163a12185cf8824255a71
parent a5502e31cb558c6e257d1dd1889c073a793e3d9d

Make JNI work correctly with default methods.

Also adds some tests for JNI and DefaultMethods.

Bug: 27259142
Bug: 24618811

Change-Id: I31222e3e41059d803be1dbb0f40e1144ac4bf457

runtime/mirror/class-inl.h

diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index 3f806d3..19584ed 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -502,7 +502,7 @@
   if (method->IsDirect()) {
     return method;
   }
-  if (method->GetDeclaringClass()->IsInterface() && !method->IsMiranda()) {
+  if (method->GetDeclaringClass()->IsInterface() && !method->IsCopied()) {
     return FindVirtualMethodForInterface(method, pointer_size);
   }
   return FindVirtualMethodForVirtual(method, pointer_size);