Fix bridge to support @CriticalNative methods

Author: Rprop

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="andhook.test"
     android:versionCode="3"
-    android:versionName="3.5.6">
+    android:versionName="3.5.8">
 
     <uses-sdk
         android:minSdkVersion="14"

app/src/main/java/andhook/test/Native.java

@@ -0,0 +1,32 @@
+package andhook.test;
+
+import andhook.lib.HookHelper;
+import andhook.lib.HookHelper.Hook;
+import andhook.test.ui.MainActivity;
+
+public final class Native {
+    private static boolean passed = false;
+
+    // @CriticalNative since Android O
+    @Hook(clazz = android.os.SystemClock.class, need_origin = true)
+    private static long currentThreadTimeMillis(final Class<?> clazz) {
+        passed = true;
+        MainActivity.output("currentThreadTimeMillis called, class = " + clazz);
+        MainActivity.output(new RuntimeException("test"));
+        return HookHelper.invokeLongOrigin(null);
+    }
+
+    public static void test() {
+        MainActivity.clear();
+        MainActivity.output("hook native java...");
+
+        passed = false;
+        HookHelper.applyHooks(Native.class);
+        android.os.SystemClock.currentThreadTimeMillis();
+
+        if (passed)
+            MainActivity.info("native java hook test passed");
+        else
+            MainActivity.alert("native java hook test failed");
+    }
+}

app/src/main/java/andhook/test/ui/MainActivity.java

@@ -9,6 +9,7 @@
 import andhook.test.InnerException;
 import andhook.test.JNI;
 import andhook.test.app.MainApplication;
+import andhook.test.Native;
 import andhook.test.R;
 import andhook.test.Static;
 import andhook.test.SystemClass;
@@ -138,6 +139,13 @@ public void onClick(final View v) {
                         SystemClass.test(MainActivity.this.getContentResolver());
                     }
                 });
+        findViewById(R.id.Native).setOnClickListener(
+                new OnClickListener() {
+                    @Override
+                    public void onClick(final View v) {
+                        Native.test();
+                    }
+                });
         findViewById(R.id.Thread).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(final View v) {

app/src/main/res/layout/activity_main.xml

@@ -80,8 +80,8 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/JNI"
-        android:layout_marginStart="77dp"
-        android:layout_marginLeft="77dp"
+        android:layout_marginStart="84dp"
+        android:layout_marginLeft="84dp"
         android:layout_marginTop="2dp"
         android:text="@string/Virtual" />
 
@@ -108,6 +108,18 @@
         android:layout_marginLeft="1dp"
         android:layout_marginTop="2dp"
         android:text="@string/SystemClass" />
+        
+    <Button
+        android:id="@+id/Native"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/Static"
+        android:layout_marginStart="87dp"
+        android:layout_marginLeft="87dp"
+        android:layout_marginTop="2dp"
+        android:text="@string/Native" />
 
     <Button
         android:id="@+id/Thread"

app/src/main/res/values/strings.xml

@@ -10,7 +10,8 @@
     <string name="Static">Static</string>
     <string name="Virtual">Virtual</string>
     <string name="WideningConversion">WideningConversion</string>
-    <string name="SystemClass">SystemClass</string>
+    <string name="SystemClass">System</string>
+    <string name="Native">Native</string>
     <string name="Thread">Thread</string>
     <string name="Exception">Exception</string>
 

lib/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="andhook.lib"
     android:versionCode="3"
-    android:versionName="3.5.6">
+    android:versionName="3.5.8">
 
     <application android:hasCode="true" />
 </manifest>

lib/src/main/java/andhook/lib/AndHook.java

@@ -9,12 +9,12 @@
 
 /**
  * @author Rprop
- * @version 3.5.6
+ * @version 3.5.8
  */
 @SuppressWarnings({"unused", "WeakerAccess", "JniMissingFunction"})
 public final class AndHook {
     private final static String LIB_NAME = "AK";
-    public final static String VERSION = "3.5.6";
+    public final static String VERSION = "3.5.8";
     public final static String LOG_TAG = "AndHook";
 
     @SuppressWarnings("all")

lib/src/main/java/andhook/lib/HookHelper.java

@@ -19,8 +19,7 @@ public final class HookHelper {
     public static final String constructorName = "<init>";
     private static final ConcurrentHashMap<Pair<String, String>, Integer> sBackups = new ConcurrentHashMap<>();
 
-    private static void warnKnownIssue(final Class<?> clazz,
-                                       final Method replace) {
+    private static void warnKnownIssue(final Method replace) {
         if (!Modifier.isStatic(replace.getModifiers())
                 || replace.getParameterTypes().length < 1
                 || replace.getParameterTypes()[0].isPrimitive()) {
@@ -37,7 +36,7 @@ public static void hook(final Member origin, final Method replace) {
         if (uniqueKey(replace) == null)
             return;
 
-        warnKnownIssue(origin.getDeclaringClass(), replace);
+        warnKnownIssue(replace);
         final int slot = AndHook.backup(origin);
         if (slot != -1 && saveBackupSlot(slot, replace)) {
             AndHook.hook(origin, replace, slot);
@@ -49,7 +48,7 @@ public static void hook(final Class<?> clazz, final String name,
         if (uniqueKey(replace) == null)
             return;
 
-        warnKnownIssue(clazz, replace);
+        warnKnownIssue(replace);
         final int slot = AndHook.backup(clazz, name, signature);
         if (slot != -1 && saveBackupSlot(slot, replace)) {
             AndHook.hook(clazz, name, signature, replace, slot);

lib/src/main/java/andhook/lib/xposed/XposedBridge.java

@@ -111,8 +111,6 @@ public static XC_MethodHook.Unhook hookMethod(final Member hookMethod, final XC_
      *
      * @param hookMethod The method for which the callback should be removed.
      * @param callback   The reference to the callback as specified in {@link #hookMethod}.
-     * @deprecated Use {@link XC_MethodHook.Unhook#unhook} instead. An instance of the {@code Unhook}
-     * class is returned when you hook the method.
      */
     @SuppressWarnings("all")
     public static void unhookMethod(final Member hookMethod, final XC_MethodHook callback) {