From 3bd7c469849643e40f74bd85b6718bde620ce99e Mon Sep 17 00:00:00 2001 From: LoveSy Date: Thu, 28 Jan 2021 18:01:26 +0800 Subject: [PATCH] Remove useless codes --- .../_hooker/yahfa/HandleBindAppHooker.java | 31 ------------ .../yahfa/LoadedApkConstructorHooker.java | 47 ------------------- .../yahfa/StartBootstrapServicesHooker.java | 28 ----------- .../yahfa/StartBootstrapServicesHooker11.java | 31 ------------ .../edxp/_hooker/yahfa/SystemMainHooker.java | 35 -------------- .../entry/yahfa/AppBootstrapHookInfo.java | 12 ----- .../entry/yahfa/SysBootstrapHookInfo.java | 14 ------ .../edxp/entry/yahfa/SysInnerHookInfo.java | 19 -------- .../riru/edxp/proxy/BaseRouter.java | 22 +++------ 9 files changed, 7 insertions(+), 232 deletions(-) delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/HandleBindAppHooker.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/LoadedApkConstructorHooker.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker11.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/SystemMainHooker.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/AppBootstrapHookInfo.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysBootstrapHookInfo.java delete mode 100644 edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysInnerHookInfo.java diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/HandleBindAppHooker.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/HandleBindAppHooker.java deleted file mode 100644 index 2174fff8..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/HandleBindAppHooker.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.elderdrivers.riru.edxp._hooker.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.HandleBindApp; - -import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.annotation.ApiSensitive; -import de.robv.android.xposed.annotation.Level; - -@ApiSensitive(Level.LOW) -public class HandleBindAppHooker implements KeepMembers { - - public static String className = "android.app.ActivityThread"; - public static String methodName = "handleBindApplication"; - public static String methodSig = "(Landroid/app/ActivityThread$AppBindData;)V"; - - public static void hook(final Object thiz, final Object bindData) throws Throwable { - final XC_MethodHook methodHook = new HandleBindApp(); - final XC_MethodHook.MethodHookParam param = new XC_MethodHook.MethodHookParam(); - param.thisObject = thiz; - param.args = new Object[]{bindData}; - methodHook.callBeforeHookedMethod(param); - if (!param.returnEarly) { - backup(thiz, bindData); - } - methodHook.callAfterHookedMethod(param); - } - - public static void backup(Object thiz, Object bindData) { - } -} \ No newline at end of file diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/LoadedApkConstructorHooker.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/LoadedApkConstructorHooker.java deleted file mode 100644 index 14845299..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/LoadedApkConstructorHooker.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.elderdrivers.riru.edxp._hooker.yahfa; - -import android.app.ActivityThread; -import android.content.pm.ApplicationInfo; -import android.content.res.CompatibilityInfo; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.LoadedApkCstr; - -import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.annotation.ApiSensitive; -import de.robv.android.xposed.annotation.Level; - -@ApiSensitive(Level.LOW) -public class LoadedApkConstructorHooker implements KeepMembers { - public static String className = "android.app.LoadedApk"; - public static String methodName = ""; - public static String methodSig = "(Landroid/app/ActivityThread;" + - "Landroid/content/pm/ApplicationInfo;" + - "Landroid/content/res/CompatibilityInfo;" + - "Ljava/lang/ClassLoader;ZZZ)V"; - - public static void hook(Object thiz, ActivityThread activityThread, - ApplicationInfo aInfo, CompatibilityInfo compatInfo, - ClassLoader baseLoader, boolean securityViolation, - boolean includeCode, boolean registerPackage) throws Throwable { - - final XC_MethodHook methodHook = new LoadedApkCstr(); - final XC_MethodHook.MethodHookParam param = new XC_MethodHook.MethodHookParam(); - param.thisObject = thiz; - param.args = new Object[]{activityThread, aInfo, compatInfo, baseLoader, securityViolation, - includeCode, registerPackage}; - methodHook.callBeforeHookedMethod(param); - if (!param.returnEarly) { - backup(thiz, activityThread, aInfo, compatInfo, baseLoader, securityViolation, - includeCode, registerPackage); - } - methodHook.callAfterHookedMethod(param); - } - - public static void backup(Object thiz, ActivityThread activityThread, - ApplicationInfo aInfo, CompatibilityInfo compatInfo, - ClassLoader baseLoader, boolean securityViolation, - boolean includeCode, boolean registerPackage) { - - } -} \ No newline at end of file diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker.java deleted file mode 100644 index 17f1f519..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.elderdrivers.riru.edxp._hooker.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; - -import de.robv.android.xposed.XC_MethodHook; - -public class StartBootstrapServicesHooker implements KeepMembers { - public static String className = "com.android.server.SystemServer"; - public static String methodName = "startBootstrapServices"; - public static String methodSig = "()V"; - - public static void hook(Object systemServer) throws Throwable { - final XC_MethodHook methodHook = new StartBootstrapServices(); - final XC_MethodHook.MethodHookParam param = new XC_MethodHook.MethodHookParam(); - param.thisObject = systemServer; - param.args = new Object[]{}; - methodHook.callBeforeHookedMethod(param); - if (!param.returnEarly) { - backup(systemServer); - } - methodHook.callAfterHookedMethod(param); - } - - public static void backup(Object systemServer) { - - } -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker11.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker11.java deleted file mode 100644 index e47facfb..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/StartBootstrapServicesHooker11.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.elderdrivers.riru.edxp._hooker.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; - -import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.annotation.ApiSensitive; -import de.robv.android.xposed.annotation.Level; - -@ApiSensitive(Level.LOW) -public class StartBootstrapServicesHooker11 implements KeepMembers { - public static String className = "com.android.server.SystemServer"; - public static String methodName = "startBootstrapServices"; - public static String methodSig = "(Lcom/android/server/utils/TimingsTraceAndSlog;)V"; - - public static void hook(Object systemServer, Object traceAndSlog) throws Throwable { - final XC_MethodHook methodHook = new StartBootstrapServices(); - final XC_MethodHook.MethodHookParam param = new XC_MethodHook.MethodHookParam(); - param.thisObject = systemServer; - param.args = new Object[]{traceAndSlog}; - methodHook.callBeforeHookedMethod(param); - if (!param.returnEarly) { - backup(systemServer, traceAndSlog); - } - methodHook.callAfterHookedMethod(param); - } - - public static void backup(Object systemServer, Object traceAndSlog) { - - } -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/SystemMainHooker.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/SystemMainHooker.java deleted file mode 100644 index be3a46a8..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/_hooker/yahfa/SystemMainHooker.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elderdrivers.riru.edxp._hooker.yahfa; - -import android.app.ActivityThread; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.impl.SystemMain; - -import de.robv.android.xposed.XC_MethodHook; -import de.robv.android.xposed.annotation.ApiSensitive; -import de.robv.android.xposed.annotation.Level; - -@ApiSensitive(Level.LOW) -public class SystemMainHooker implements KeepMembers { - - public static String className = "android.app.ActivityThread"; - public static String methodName = "systemMain"; - public static String methodSig = "()Landroid/app/ActivityThread;"; - - public static ActivityThread hook() throws Throwable { - final XC_MethodHook methodHook = new SystemMain(); - final XC_MethodHook.MethodHookParam param = new XC_MethodHook.MethodHookParam(); - param.thisObject = null; - param.args = new Object[]{}; - methodHook.callBeforeHookedMethod(param); - if (!param.returnEarly) { - param.setResult(backup()); - } - methodHook.callAfterHookedMethod(param); - return (ActivityThread) param.getResult(); - } - - public static ActivityThread backup() { - return null; - } -} \ No newline at end of file diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/AppBootstrapHookInfo.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/AppBootstrapHookInfo.java deleted file mode 100644 index 8fb6d759..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/AppBootstrapHookInfo.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.elderdrivers.riru.edxp.entry.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.yahfa.HandleBindAppHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.LoadedApkConstructorHooker; - -public class AppBootstrapHookInfo implements KeepMembers { - public static String[] hookItemNames = { - HandleBindAppHooker.class.getName(), - LoadedApkConstructorHooker.class.getName(), - }; -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysBootstrapHookInfo.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysBootstrapHookInfo.java deleted file mode 100644 index fb50926c..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysBootstrapHookInfo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.elderdrivers.riru.edxp.entry.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.yahfa.HandleBindAppHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.SystemMainHooker; - -public class SysBootstrapHookInfo implements KeepMembers { - public static String[] hookItemNames = { - HandleBindAppHooker.class.getName(), - SystemMainHooker.class.getName(), - LoadedApkConstructorHooker.class.getName(), - }; -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysInnerHookInfo.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysInnerHookInfo.java deleted file mode 100644 index 28b1f194..00000000 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/entry/yahfa/SysInnerHookInfo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elderdrivers.riru.edxp.entry.yahfa; - -import com.elderdrivers.riru.common.KeepMembers; -import com.elderdrivers.riru.edxp._hooker.yahfa.StartBootstrapServicesHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.StartBootstrapServicesHooker11; -import com.elderdrivers.riru.edxp.util.Versions; - -public class SysInnerHookInfo implements KeepMembers { - - public static Class getSysInnerHookerClass() { - return Versions.hasR() ? - StartBootstrapServicesHooker11.class : - StartBootstrapServicesHooker.class; - } - - public static String[] hookItemNames = { - getSysInnerHookerClass().getName() - }; -} diff --git a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java index ab69e24f..ca72cd87 100644 --- a/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java +++ b/edxp-core/src/main/java/com/elderdrivers/riru/edxp/proxy/BaseRouter.java @@ -9,14 +9,6 @@ import com.elderdrivers.riru.edxp._hooker.impl.HandleBindApp; import com.elderdrivers.riru.edxp._hooker.impl.LoadedApkCstr; import com.elderdrivers.riru.edxp._hooker.impl.StartBootstrapServices; import com.elderdrivers.riru.edxp._hooker.impl.SystemMain; -import com.elderdrivers.riru.edxp._hooker.yahfa.HandleBindAppHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.LoadedApkConstructorHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.StartBootstrapServicesHooker; -import com.elderdrivers.riru.edxp._hooker.yahfa.SystemMainHooker; -import com.elderdrivers.riru.edxp.core.yahfa.HookMain; -import com.elderdrivers.riru.edxp.entry.yahfa.AppBootstrapHookInfo; -import com.elderdrivers.riru.edxp.entry.yahfa.SysBootstrapHookInfo; -import com.elderdrivers.riru.edxp.entry.yahfa.SysInnerHookInfo; import com.elderdrivers.riru.edxp.util.Utils; import com.elderdrivers.riru.edxp.util.Versions; @@ -80,14 +72,14 @@ public abstract class BaseRouter implements Router { Utils.logD("startBootstrapHook starts: isSystem = " + isSystem); ClassLoader classLoader = BaseRouter.class.getClassLoader(); if (isSystem) { - XposedHelpers.findAndHookMethod(SystemMainHooker.className, classLoader, - SystemMainHooker.methodName, new SystemMain()); + XposedHelpers.findAndHookMethod("android.app.ActivityThread", classLoader, + "systemMain", new SystemMain()); } - XposedHelpers.findAndHookMethod(HandleBindAppHooker.className, classLoader, - HandleBindAppHooker.methodName, + XposedHelpers.findAndHookMethod("android.app.ActivityThread", classLoader, + "handleBindApplication", "android.app.ActivityThread$AppBindData", new HandleBindApp()); - XposedHelpers.findAndHookConstructor(LoadedApkConstructorHooker.className, classLoader, + XposedHelpers.findAndHookConstructor("android.app.LoadedApk", classLoader, ActivityThread.class, ApplicationInfo.class, CompatibilityInfo.class, ClassLoader.class, boolean.class, boolean.class, boolean.class, new LoadedApkCstr()); @@ -98,8 +90,8 @@ public abstract class BaseRouter implements Router { Object[] paramTypesAndCallback = Versions.hasR() ? new Object[]{"com.android.server.utils.TimingsTraceAndSlog", sbsHooker} : new Object[]{sbsHooker}; - XposedHelpers.findAndHookMethod(StartBootstrapServicesHooker.className, + XposedHelpers.findAndHookMethod("com.android.server.SystemServer", SystemMain.systemServerCL, - StartBootstrapServicesHooker.methodName, paramTypesAndCallback); + "startBootstrapServices", paramTypesAndCallback); } }