WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Save zygoteInit callbacks to invoke after process forked" 

This reverts commit 8c4682e
This commit is contained in:
solohsu 2019-02-20 13:20:39 +08:00
parent 6254660b9b
commit f417209b81
4 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bridge/src/main/java/com/elderdrivers/riru/xposed/Main.java
View File

@ -84,7 +84,6 @@ public class Main implements KeepAll {
// load modules for each app process on its forked // load modules for each app process on its forked
Router.loadModulesSafely(); Router.loadModulesSafely();
} }
Router.callZygoteInits();
} else { } else {
// in zygote process, res is child zygote pid // in zygote process, res is child zygote pid
// don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66 // don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66
@ -110,7 +109,6 @@ public class Main implements KeepAll {
Router.prepare(true); Router.prepare(true);
Router.onProcessForked(true); Router.onProcessForked(true);
Router.loadModulesSafely(); Router.loadModulesSafely();
Router.callZygoteInits();
} else { } else {
// in zygote process, res is child zygote pid // in zygote process, res is child zygote pid
// don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66 // don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66

14
Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/Router.java
View File

@ -7,9 +7,6 @@ import com.elderdrivers.riru.xposed.entry.bootstrap.SysInnerHookInfo;
import com.elderdrivers.riru.xposed.entry.hooker.SystemMainHooker; import com.elderdrivers.riru.xposed.entry.hooker.SystemMainHooker;
import com.elderdrivers.riru.xposed.util.Utils; import com.elderdrivers.riru.xposed.util.Utils;
import java.util.Map;
import de.robv.android.xposed.IXposedHookZygoteInit;
import de.robv.android.xposed.XposedBridge; import de.robv.android.xposed.XposedBridge;
import de.robv.android.xposed.XposedInit; import de.robv.android.xposed.XposedInit;
@ -19,7 +16,6 @@ public class Router {
// this flag is needed when loadModules // this flag is needed when loadModules
XposedInit.startsSystemServer = isSystem; XposedInit.startsSystemServer = isSystem;
} }
public static void onProcessForked(boolean isSystem) { public static void onProcessForked(boolean isSystem) {
// Initialize the Xposed framework // Initialize the Xposed framework
try { try {
@ -39,16 +35,6 @@ public class Router {
} }
} }
public static void callZygoteInits() {
for (Map.Entry<IXposedHookZygoteInit, IXposedHookZygoteInit.StartupParam> entry : XposedBridge.sZygoteInitCallbacks.entrySet()) {
try {
entry.getKey().initZygote(entry.getValue());
} catch (Throwable t) {
Utils.logE("Failed to load class " + entry.getKey().getClass(), t);
}
}
}
public static void startBootstrapHook(boolean isSystem) { public static void startBootstrapHook(boolean isSystem) {
Utils.logD("startBootstrapHook starts: isSystem = " + isSystem); Utils.logD("startBootstrapHook starts: isSystem = " + isSystem);
ClassLoader classLoader = XposedBridge.BOOTCLASSLOADER; ClassLoader classLoader = XposedBridge.BOOTCLASSLOADER;

8
Bridge/src/main/java/de/robv/android/xposed/XposedBridge.java
View File

@ -65,7 +65,6 @@ public final class XposedBridge {
// built-in handlers // built-in handlers
private static final Map<Member, CopyOnWriteSortedSet<XC_MethodHook>> sHookedMethodCallbacks = new HashMap<>(); private static final Map<Member, CopyOnWriteSortedSet<XC_MethodHook>> sHookedMethodCallbacks = new HashMap<>();
public static final CopyOnWriteSortedSet<XC_LoadPackage> sLoadedPackageCallbacks = new CopyOnWriteSortedSet<>(); public static final CopyOnWriteSortedSet<XC_LoadPackage> sLoadedPackageCallbacks = new CopyOnWriteSortedSet<>();
public static final HashMap<IXposedHookZygoteInit, IXposedHookZygoteInit.StartupParam> sZygoteInitCallbacks = new HashMap<>();
/*package*/ static final CopyOnWriteSortedSet<XC_InitPackageResources> sInitPackageResourcesCallbacks = new CopyOnWriteSortedSet<>(); /*package*/ static final CopyOnWriteSortedSet<XC_InitPackageResources> sInitPackageResourcesCallbacks = new CopyOnWriteSortedSet<>();
private XposedBridge() {} private XposedBridge() {}
@ -373,13 +372,6 @@ public final class XposedBridge {
} }
} }
public static void hookZygoteInit(IXposedHookZygoteInit moduleInstance,
IXposedHookZygoteInit.StartupParam param) {
synchronized (sZygoteInitCallbacks) {
sZygoteInitCallbacks.put(moduleInstance, param);
}
}
/** /**
* Adds a callback to be executed when the resources for an app are initialized. * Adds a callback to be executed when the resources for an app are initialized.
* *

3
Bridge/src/main/java/de/robv/android/xposed/XposedInit.java
View File

@ -208,8 +208,7 @@ public final class XposedInit {
IXposedHookZygoteInit.StartupParam param = new IXposedHookZygoteInit.StartupParam(); IXposedHookZygoteInit.StartupParam param = new IXposedHookZygoteInit.StartupParam();
param.modulePath = apk; param.modulePath = apk;
param.startsSystemServer = startsSystemServer; param.startsSystemServer = startsSystemServer;
// ((IXposedHookZygoteInit) moduleInstance).initZygote(param); ((IXposedHookZygoteInit) moduleInstance).initZygote(param);
XposedBridge.hookZygoteInit((IXposedHookZygoteInit) moduleInstance, param);
} }
if (moduleInstance instanceof IXposedHookLoadPackage) if (moduleInstance instanceof IXposedHookLoadPackage)