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

support lower versions and fix activityInfo pollution

This commit is contained in:
5ec1cff 2024-02-11 12:34:51 +08:00 committed by JingMatrix
parent 8c0fb4f5eb
commit 571655dc0a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
magisk-loader/src/main/java/org/lsposed/lspd/util/ParasiticManagerSystemHooker.java
View File

@ -36,19 +36,21 @@ public class ParasiticManagerSystemHooker implements HandleSystemServerProcessHo
private static class Hooker implements XposedInterface.Hooker { private static class Hooker implements XposedInterface.Hooker {
@AfterInvocation @AfterInvocation
public static void afterHookedMethod(XposedInterface.AfterHookCallback callback) throws Throwable { public static void afterHookedMethod(XposedInterface.AfterHookCallback callback) throws Throwable {
Log.d("LSPosed", "checking new activity");
var intent = (Intent) callback.getArgs()[0]; var intent = (Intent) callback.getArgs()[0];
Log.d("LSPosed", "intent=" + intent);
if (intent == null) return; if (intent == null) return;
// TODO: keep sync with LSPManagerService getManagerIntent
if (!intent.hasCategory("org.lsposed.manager.LAUNCH_MANAGER")) return; if (!intent.hasCategory("org.lsposed.manager.LAUNCH_MANAGER")) return;
var aInfo = (ActivityInfo) callback.getResult(); var aInfo = (ActivityInfo) callback.getResult();
if (aInfo == null || !"com.android.shell".equals(aInfo.packageName)) return; if (aInfo == null || !"com.android.shell".equals(aInfo.packageName)) return;
// We shouldn't pollute system's object
aInfo = new ActivityInfo(aInfo);
// use a different process name
aInfo.processName = "org.lsposed.manager"; aInfo.processName = "org.lsposed.manager";
// choose a theme that has transition animation
aInfo.theme = android.R.style.Theme_Material_Light_NoActionBar; aInfo.theme = android.R.style.Theme_Material_Light_NoActionBar;
// remove some annoying flags
aInfo.flags = aInfo.flags & ~(ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS); aInfo.flags = aInfo.flags & ~(ActivityInfo.FLAG_EXCLUDE_FROM_RECENTS | ActivityInfo.FLAG_FINISH_ON_CLOSE_SYSTEM_DIALOGS);
BridgeService.getService().preStartManager(); BridgeService.getService().preStartManager();
Log.d("LSPosed", "replaced activity"); callback.setResult(aInfo);
} }
} }
@ -58,9 +60,16 @@ public class ParasiticManagerSystemHooker implements HandleSystemServerProcessHo
try { try {
Class<?> supervisorClass; Class<?> supervisorClass;
try { try {
// 14-12.0
supervisorClass = Class.forName("com.android.server.wm.ActivityTaskSupervisor", false, classLoader); supervisorClass = Class.forName("com.android.server.wm.ActivityTaskSupervisor", false, classLoader);
} catch (ClassNotFoundException ignore) { } catch (ClassNotFoundException ignore) {
try {
// 11-10
supervisorClass = Class.forName("com.android.server.wm.ActivityStackSupervisor", false, classLoader); supervisorClass = Class.forName("com.android.server.wm.ActivityStackSupervisor", false, classLoader);
} catch (ClassNotFoundException ignore2) {
// 9-8.1
supervisorClass = Class.forName("com.android.server.am.ActivityStackSupervisor", false, classLoader);
}
} }
LSPosedHelper.hookMethod(Hooker.class, supervisorClass, "resolveActivity", Intent.class, ResolveInfo.class, int.class, ProfilerInfo.class); LSPosedHelper.hookMethod(Hooker.class, supervisorClass, "resolveActivity", Intent.class, ResolveInfo.class, int.class, ProfilerInfo.class);
/* /*