diff --git a/core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java b/core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java index e398d236..547a25f5 100644 --- a/core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java +++ b/core/src/main/java/com/swift/sandhook/xposedcompat/hookstub/HookStubManager.java @@ -250,14 +250,6 @@ public class HookStubManager { thiz = originMethod.getDeclaringClass(); } - if (XposedBridge.disableHooks) { - if (hasStubBackup) { - return callOrigin.call(stubArgs); - } else { - return callOrigin(entity, originMethod, thiz, args); - } - } - DexLog.printMethodHookIn(originMethod); Object[] snapshot = additionalHookInfos[id].callbacks.getSnapshot(); @@ -337,10 +329,6 @@ public class HookStubManager { public static Object hookBridge(Member origin, Method backup, XposedBridge.AdditionalHookInfo additionalHookInfo, Object thiz, Object... args) throws Throwable { - if (XposedBridge.disableHooks) { - return SandHook.callOriginMethod(true, origin, backup, thiz, args); - } - DexLog.printMethodHookIn(origin); Object[] snapshot = additionalHookInfo.callbacks.getSnapshot(); diff --git a/core/src/main/java/de/robv/android/xposed/LspHooker.java b/core/src/main/java/de/robv/android/xposed/LspHooker.java index 77e205fd..b452769d 100644 --- a/core/src/main/java/de/robv/android/xposed/LspHooker.java +++ b/core/src/main/java/de/robv/android/xposed/LspHooker.java @@ -25,8 +25,6 @@ import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import static de.robv.android.xposed.XposedBridge.disableHooks; - public class LspHooker { private final XposedBridge.AdditionalHookInfo additionalInfo; private final Member method; @@ -57,13 +55,6 @@ public class LspHooker { System.arraycopy(args, 1, param.args, 0, args.length - 1); } - if (disableHooks) { - try { - return backup.invoke(param.thisObject, param.args); - } catch (InvocationTargetException ite) { - throw ite.getCause(); - } - } Object[] callbacksSnapshot = additionalInfo.callbacks.getSnapshot(); final int callbacksLength = callbacksSnapshot.length; if (callbacksLength == 0) { diff --git a/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java index 129bd2d6..071582cb 100644 --- a/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java +++ b/core/src/main/java/de/robv/android/xposed/XSharedPreferences.java @@ -183,7 +183,6 @@ public final class XSharedPreferences implements SharedPreferences { } } if (newModule) { - mFile = new File(serviceClient.getPrefsPath( packageName ), prefFileName + ".xml"); } else { mFile = new File(Environment.getDataDirectory(), "data/" + packageName + "/shared_prefs/" + prefFileName + ".xml"); diff --git a/core/src/main/java/de/robv/android/xposed/XposedBridge.java b/core/src/main/java/de/robv/android/xposed/XposedBridge.java index f323861b..f359309a 100644 --- a/core/src/main/java/de/robv/android/xposed/XposedBridge.java +++ b/core/src/main/java/de/robv/android/xposed/XposedBridge.java @@ -82,8 +82,6 @@ public final class XposedBridge { private static final int RUNTIME_DALVIK = 1; private static final int RUNTIME_ART = 2; - public static boolean disableHooks = false; - // This field is set "magically" on MIUI. /*package*/ static long BOOT_START_TIME; @@ -321,15 +319,6 @@ public final class XposedBridge { Object thisObject, Object[] args) throws Throwable { AdditionalHookInfo additionalInfo = (AdditionalHookInfo) additionalInfoObj; - if (disableHooks) { - try { - return invokeOriginalMethodNative(method, originalMethodId, additionalInfo.parameterTypes, - additionalInfo.returnType, thisObject, args); - } catch (InvocationTargetException e) { - throw e.getCause(); - } - } - Object[] callbacksSnapshot = additionalInfo.callbacks.getSnapshot(); final int callbacksLength = callbacksSnapshot.length; if (callbacksLength == 0) { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java b/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java index ddc34bce..27cff843 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/hooker/StartBootstrapServicesHooker.java @@ -38,10 +38,6 @@ public class StartBootstrapServicesHooker extends XC_MethodHook { @Override protected void beforeHookedMethod(MethodHookParam param) throws Throwable { - if (XposedBridge.disableHooks) { - return; - } - logD("SystemServer#startBootstrapServices() starts"); try { diff --git a/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java b/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java index 88f28016..53b04b12 100644 --- a/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java +++ b/core/src/main/java/io/github/lsposed/lspd/hooker/SystemMainHooker.java @@ -35,9 +35,6 @@ public class SystemMainHooker extends XC_MethodHook { @Override protected void afterHookedMethod(MethodHookParam param) throws Throwable { - if (XposedBridge.disableHooks) { - return; - } Hookers.logD("ActivityThread#systemMain() starts"); try { // get system_server classLoader diff --git a/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java index 0e3b3723..f6815bd9 100644 --- a/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java +++ b/core/src/main/java/io/github/lsposed/lspd/proxy/BaseRouter.java @@ -63,7 +63,6 @@ public abstract class BaseRouter implements Router { XposedInit.initForZygote(isSystem); } catch (Throwable t) { Utils.logE("error during Xposed initialization", t); - XposedBridge.disableHooks = true; } }