summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-10-13 01:11:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-13 01:11:42 +0000
commit71c02c38493ca8e05ee27b527a137aa7fe543fce (patch)
treec4adc26ed61fc2bb04cec2e5a5b99d79da4a0801 /runtime
parent5606ffa6f96390a4542e706ae388a99b8eedf71e (diff)
parentf015c2f4835a9985a8b31cfc810129b69865a6c4 (diff)
downloadandroid_art-71c02c38493ca8e05ee27b527a137aa7fe543fce.tar.gz
android_art-71c02c38493ca8e05ee27b527a137aa7fe543fce.tar.bz2
android_art-71c02c38493ca8e05ee27b527a137aa7fe543fce.zip
am f015c2f4: ART: Add missing GetInterfaceMethodIfProxy
* commit 'f015c2f4835a9985a8b31cfc810129b69865a6c4': ART: Add missing GetInterfaceMethodIfProxy
Diffstat (limited to 'runtime')
-rw-r--r--runtime/reflection.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc
index 11522d9914..db09afbaea 100644
--- a/runtime/reflection.cc
+++ b/runtime/reflection.cc
@@ -453,7 +453,7 @@ JValue InvokeWithVarArgs(const ScopedObjectAccessAlreadyRunnable& soa, jobject o
}
mirror::Object* receiver = method->IsStatic() ? nullptr : soa.Decode<mirror::Object*>(obj);
uint32_t shorty_len = 0;
- const char* shorty = method->GetShorty(&shorty_len);
+ const char* shorty = method->GetInterfaceMethodIfProxy(sizeof(void*))->GetShorty(&shorty_len);
JValue result;
ArgArray arg_array(shorty, shorty_len);
arg_array.BuildArgArrayFromVarArgs(soa, receiver, args);
@@ -483,7 +483,7 @@ JValue InvokeWithJValues(const ScopedObjectAccessAlreadyRunnable& soa, jobject o
}
mirror::Object* receiver = method->IsStatic() ? nullptr : soa.Decode<mirror::Object*>(obj);
uint32_t shorty_len = 0;
- const char* shorty = method->GetShorty(&shorty_len);
+ const char* shorty = method->GetInterfaceMethodIfProxy(sizeof(void*))->GetShorty(&shorty_len);
JValue result;
ArgArray arg_array(shorty, shorty_len);
arg_array.BuildArgArrayFromJValues(soa, receiver, args);
@@ -514,7 +514,7 @@ JValue InvokeVirtualOrInterfaceWithJValues(const ScopedObjectAccessAlreadyRunnab
receiver = nullptr;
}
uint32_t shorty_len = 0;
- const char* shorty = method->GetShorty(&shorty_len);
+ const char* shorty = method->GetInterfaceMethodIfProxy(sizeof(void*))->GetShorty(&shorty_len);
JValue result;
ArgArray arg_array(shorty, shorty_len);
arg_array.BuildArgArrayFromJValues(soa, receiver, args);
@@ -545,7 +545,7 @@ JValue InvokeVirtualOrInterfaceWithVarArgs(const ScopedObjectAccessAlreadyRunnab
receiver = nullptr;
}
uint32_t shorty_len = 0;
- const char* shorty = method->GetShorty(&shorty_len);
+ const char* shorty = method->GetInterfaceMethodIfProxy(sizeof(void*))->GetShorty(&shorty_len);
JValue result;
ArgArray arg_array(shorty, shorty_len);
arg_array.BuildArgArrayFromVarArgs(soa, receiver, args);