Merge pull request #458 from shily/master

fixed Hook BluetoothAdapter#getAddress failed >= JELLY_BEAN_MR1
asLody · Jun 1, 2018 · f3b0767 · f3b0767
2 parents 2c593a5 + 31559f6
commit f3b0767
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...alApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/bluetooth/BluetoothStub.java b/...alApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/bluetooth/BluetoothStub.java
@@ -9,6 +9,7 @@
 import java.lang.reflect.Method;
 
 import mirror.android.bluetooth.IBluetooth;
+import mirror.android.bluetooth.IBluetoothManager;
 
 /**
  * @see android.bluetooth.BluetoothManager
@@ -19,7 +20,8 @@ public class BluetoothStub extends BinderInvocationProxy {
             "bluetooth";
 
     public BluetoothStub() {
-        super(IBluetooth.Stub.asInterface, SERVICE_NAME);
+        super(Build.VERSION.SDK_INT >= 17 ? IBluetoothManager.Stub.asInterface : IBluetooth.Stub.asInterface,
+                SERVICE_NAME);
     }
 
     @Override

diff --git a/VirtualApp/lib/src/main/java/mirror/android/bluetooth/IBluetoothManager.java b/VirtualApp/lib/src/main/java/mirror/android/bluetooth/IBluetoothManager.java
@@ -0,0 +1,23 @@
+package mirror.android.bluetooth;
+
+import android.os.IBinder;
+import android.os.IInterface;
+
+import mirror.MethodParams;
+import mirror.RefClass;
+import mirror.RefStaticMethod;
+
+public class IBluetoothManager {
+    /**
+     * @see android.bluetooth.IBluetoothManager
+     * */
+    public static Class<?> TYPE = RefClass.load(IBluetoothManager.class, "android.bluetooth.IBluetoothManager");
+    /**
+     * @see android.bluetooth.IBluetoothManager.Stub
+     * */
+    public static class Stub {
+        public static Class<?> TYPE = RefClass.load(Stub.class, "android.bluetooth.IBluetoothManager$Stub");
+        @MethodParams({IBinder.class})
+        public static RefStaticMethod<IInterface> asInterface;
+    }
+}