diff options
| author | Alex Light <allight@google.com> | 2016-02-22 13:43:29 -0800 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2016-02-23 13:24:05 -0800 |
| commit | 3612149aee482ab7a17da68b0ef5fef3879729a2 (patch) | |
| tree | 42180a35266333cbf37163a12185cf8824255a71 /runtime/mirror/class-inl.h | |
| parent | a5502e31cb558c6e257d1dd1889c073a793e3d9d (diff) | |
| download | art-3612149aee482ab7a17da68b0ef5fef3879729a2.tar.gz art-3612149aee482ab7a17da68b0ef5fef3879729a2.tar.bz2 art-3612149aee482ab7a17da68b0ef5fef3879729a2.zip | |
Make JNI work correctly with default methods.
Also adds some tests for JNI and DefaultMethods.
Bug: 27259142
Bug: 24618811
Change-Id: I31222e3e41059d803be1dbb0f40e1144ac4bf457
Diffstat (limited to 'runtime/mirror/class-inl.h')
| -rw-r--r-- | runtime/mirror/class-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h index 3f806d3ca1..19584edf7f 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -502,7 +502,7 @@ inline ArtMethod* Class::FindVirtualMethodForVirtualOrInterface(ArtMethod* metho 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); |