diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 01:23:27 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-06-03 01:23:27 +0100 |
| commit | 6ae6d126ba3b50d16b6ba61f39c3982a34a49eec (patch) | |
| tree | f588c43e574217cd38777f8282314d250d9dbc6a /runtime/mirror/class-inl.h | |
| parent | 1ca6a11a61b57edea370adf4454876ccf869d92e (diff) | |
| parent | d5e4ac0abdeeb4dc13bd05a40bf496299a787536 (diff) | |
| download | android_art-stable/cm-11.0-XNG3C.tar.gz android_art-stable/cm-11.0-XNG3C.tar.bz2 android_art-stable/cm-11.0-XNG3C.zip | |
Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
Android 4.4.3 release 1
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 1e1138745d..998ebe1a8f 100644 --- a/runtime/mirror/class-inl.h +++ b/runtime/mirror/class-inl.h @@ -241,7 +241,7 @@ inline ArtMethod* Class::FindVirtualMethodForVirtualOrInterface(ArtMethod* metho if (method->IsDirect()) { return method; } - if (method->GetDeclaringClass()->IsInterface()) { + if (method->GetDeclaringClass()->IsInterface() && !method->IsMiranda()) { return FindVirtualMethodForInterface(method); } return FindVirtualMethodForVirtual(method); |