Turn invokeOriginalMethodNative() into a fast native method

It's not doing more than Method.invoke(), which is also marked as fast native.
0x00000003 · Nov 15, 2015 · bbf9463 · bbf9463
1 parent f61eb37
commit bbf9463
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/libxposed_art.cpp b/libxposed_art.cpp
@@ -14,6 +14,7 @@
 #endif
 #include "mirror/object-inl.h"
 #include "mirror/throwable.h"
+#include "native/scoped_fast_native_object_access.h"
 #include "reflection.h"
 #include "scoped_thread_state_change.h"
 #include "well_known_classes.h"
@@ -145,7 +146,7 @@ void XposedBridge_hookMethodNative(JNIEnv* env, jclass, jobject javaReflectedMet
 
 jobject XposedBridge_invokeOriginalMethodNative(JNIEnv* env, jclass, jobject javaMethod,
             jint, jobjectArray, jclass, jobject javaReceiver, jobjectArray javaArgs) {
-  ScopedObjectAccess soa(env);
+    ScopedFastNativeObjectAccess soa(env);
 #if PLATFORM_SDK_VERSION >= 23
     return InvokeMethod(soa, javaMethod, javaReceiver, javaArgs);
 #else

diff --git a/libxposed_common.cpp b/libxposed_common.cpp
@@ -293,7 +293,7 @@ int register_natives_XposedBridge(JNIEnv* env, jclass clazz) {
         NATIVE_METHOD(XposedBridge, hookMethodNative, "(Ljava/lang/reflect/Member;Ljava/lang/Class;ILjava/lang/Object;)V"),
 #ifdef ART_TARGET
         NATIVE_METHOD(XposedBridge, invokeOriginalMethodNative,
-            "(Ljava/lang/reflect/Member;I[Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"),
+            "!(Ljava/lang/reflect/Member;I[Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"),
 #endif
         NATIVE_METHOD(XposedBridge, setObjectClassNative, "(Ljava/lang/Object;Ljava/lang/Class;)V"),
         NATIVE_METHOD(XposedBridge, dumpObjectNative, "(Ljava/lang/Object;)V"),