Bump version for 3.6.0 release

Author: Rprop

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 AndHook
+Copyright (c) 2019 AndHook
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.8">
+    android:versionName="3.6.0">
 
     <uses-sdk
         android:minSdkVersion="14"

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

@@ -8,7 +8,9 @@ public final class Constructor {
     private static boolean passed;
 
     private Constructor() {
-        MainActivity.output("original constructor hit, this = " + this);
+        final Object thiz = this; // dummy code to avoid inlining
+        MainActivity.output("original constructor hit, this = " + thiz +
+                ", hash = " + thiz.hashCode());
     }
 
     @SuppressWarnings("unused")

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

@@ -5,6 +5,8 @@
 import andhook.test.ui.MainActivity;
 
 public final class InnerException {
+    private static boolean passed = false;
+
     private static final class k {
         static synchronized void a() {
             MainActivity.output("k->a");
@@ -77,15 +79,14 @@ protected void beforeHookedMethod(final MethodHookParam param)
                     throws Throwable {
                 super.beforeHookedMethod(param);
                 MainActivity.output("q->d before");
+                passed = true;
             }
         });
 
-        boolean passed = false;
         try {
             q.a();
         } catch (final UnsupportedOperationException e) {
             MainActivity.output(e);
-            passed = true;
         }
 
         if (passed)

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

@@ -8,6 +8,7 @@ public final class Native {
     private static boolean passed = false;
 
     // @CriticalNative since Android O
+    @SuppressWarnings("unused")
     @Hook(clazz = android.os.SystemClock.class, need_origin = true)
     private static long currentThreadTimeMillis(final Class<?> clazz) {
         passed = true;

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

@@ -15,9 +15,9 @@ public static void test() {
 
         passed = false;
 
-        // @NOTE that hooking methods of Thread.class is possibly unstable
-        // as they may be on the stack before, which could result in
-        // unexpected stack unwinding.
+        // Methods of Thread are likely to be in threads call stack already, 
+        // which could result in unexpected stack unwinding.
+        // Is it possible that we can fix up the stack layout?
         AndHook.stopDaemons();
         android.os.SystemClock.sleep(100);
 

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

@@ -5,6 +5,7 @@
 import andhook.lib.AndHook;
 import andhook.lib.HookHelper;
 import andhook.test.ui.MainActivity;
+
 import android.util.Log;
 
 public final class Virtual {
@@ -39,7 +40,10 @@ private static void hookWithinSameClass() throws Exception {
 
     private static class A {
         public int get() {
-            MainActivity.output("public A::get hit, this = " + this);
+            // small methods without reachable non-instruction limits will always be inlined
+            final Object thiz = this;
+            MainActivity.output("public A::get hit, this = " + thiz +
+                    ", hash = " + thiz.hashCode());
             return 0;
         }
     }
@@ -48,6 +52,7 @@ public static class B extends A {
         @Override
         public int get() {
             MainActivity.output("public B::get hit, this = " + this);
+            // the following statement could be inlined if --compiler-filter=everything
             return super.get() + 1;
         }
 

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

@@ -8,6 +8,7 @@
 import andhook.lib.xposed.XposedHelpers;
 import andhook.lib.xposed.XC_MethodHook;
 import andhook.test.ui.MainActivity;
+
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.system.OsConstants;

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 

lib/include/AndHook.h

@@ -1,7 +1,7 @@
 /*
  *
  *  @author : Rprop ([email protected])
- *  @date   : 2018/05/05
+ *  @date   : 2018/05/26
  *  https://github.com/Rprop/AndHook
  *
  */
@@ -22,16 +22,21 @@ extern "C" {
 # define AK_DEFAULT(v)
 #endif
 
+    /// <summary>
+    /// Loads the specified module using system linker or NULL if failed.
+    /// @warning `caller_addr` is necessary for loading system libraries since Android N
+    /// </summary>
+    const void *AKLoadImage(const char *path, int flag, const void *caller_addr AK_DEFAULT(NULL));
     /// <summary>
     /// Gets handle to specified module or NULL if the target is not currently loaded
     /// </summary>
     const void *AKGetImageByName(const char *name AK_DEFAULT(AK_ANDROID_RUNTIME));
     /// <summary>
-    /// Gets the address of defined symbols or NULL
+    /// Gets the address of defined symbol or NULL
     /// </summary>
     void *AKFindSymbol(const void *handle, const char *symbol);
     /// <summary>
-    /// Gets the base address of defined symbols or NULL
+    /// Gets the base address of defined module or NULL
     /// </summary>
     void *AKGetBaseAddress(const void *handle);
     /// <summary>
@@ -112,7 +117,8 @@ extern "C" {
     /// </summary>
     void AKJavaHookMethodV(JNIEnv *env, jmethodID methodId, const void *replace, jmethodID *result AK_DEFAULT(NULL));
     /// <summary>
-    /// Marks the specified java method as native (if not) and backups original method if `result` != NULL
+    /// Marks the specified java method as native (if not) and backups original method if `result` != NULL.
+    /// @warning The method must not be inlined or in any threads call stack
     /// </summary>
     AK_BOOL AKForceNativeMethod(JNIEnv *env, jmethodID methodId, const void *jni_entrypoint, AK_BOOL fast_native AK_DEFAULT(0),
                                 jmethodID *result AK_DEFAULT(NULL));
@@ -227,6 +233,7 @@ extern "C" {
     /// </summary>
     struct AKInvokeInterface {
         intptr_t version;
+        const void *(*LoadImage)(const char *path, int flag, const void *caller_addr /* = NULL*/);
         const void *(*GetImageByName)(const char *name /* = AK_ANDROID_RUNTIME */);
         void *(*FindSymbol)(const void *handle, const char *symbol);
         void *(*GetBaseAddress)(const void *handle);