Commit 812a4598 authored by swift_gan's avatar swift_gan

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/build.gradle
#	app/src/main/cpp/native-lib.cpp
#	app/src/main/cpp/trampoline/arch/arm32.S
#	app/src/main/cpp/trampoline/arch/arm64.S
parents 08fe90f5 2c6f4305
package com.swift.sandhook; package com.swift.sandhook;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.widget.TextView; import android.widget.TextView;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
...@@ -68,8 +69,8 @@ public class MainActivity extends AppCompatActivity { ...@@ -68,8 +69,8 @@ public class MainActivity extends AppCompatActivity {
// //
// methods[dexMethodIndex] = artMethod; // methods[dexMethodIndex] = artMethod;
SandHook.init(); //SandHook.init();
initHook(); //initHook();
tv.setText("" + calArtSize(method1, method2)); tv.setText("" + calArtSize(method1, method2));
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
...@@ -79,6 +80,16 @@ public class MainActivity extends AppCompatActivity { ...@@ -79,6 +80,16 @@ public class MainActivity extends AppCompatActivity {
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} }
for (int i= 0;i < 10;i++) {
new Thread(new Runnable() {
@Override
public void run() {
Log.e("Thread_Local", "thread_local_i = " + calArtSize(null, null));
}
}).start();
}
} }
public static Field getField(Class topClass, String fieldName) throws NoSuchFieldException { public static Field getField(Class topClass, String fieldName) throws NoSuchFieldException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment