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

Support Android 14 DP1 (#2377) 

Fix #2376
This commit is contained in:
LoveSy 2023-02-09 11:20:28 +08:00 committed by GitHub
parent e7c36afeb0
commit 731eae9f3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
magisk-loader/src/main/java/org/lsposed/lspd/service/ActivityController.java
View File

@ -45,8 +45,13 @@ public class ActivityController extends IActivityController.Stub {
Context ctx = ActivityThread.currentActivityThread().getSystemContext(); Context ctx = ActivityThread.currentActivityThread().getSystemContext();
var systemClassLoader = ctx.getClassLoader(); var systemClassLoader = ctx.getClassLoader();
@SuppressLint("PrivateApi") var myActivityControllerClass = Class.forName("com.android.server.am.ActivityManagerShellCommand$MyActivityController", false, systemClassLoader); @SuppressLint("PrivateApi") var myActivityControllerClass = Class.forName("com.android.server.am.ActivityManagerShellCommand$MyActivityController", false, systemClassLoader);
try {
myActivityControllerConstructor = myActivityControllerClass.getDeclaredConstructor(IActivityManager.class, PrintWriter.class, InputStream.class, myActivityControllerConstructor = myActivityControllerClass.getDeclaredConstructor(IActivityManager.class, PrintWriter.class, InputStream.class,
String.class, boolean.class); String.class, boolean.class);
} catch (NoSuchMethodException ignored) {
myActivityControllerConstructor = myActivityControllerClass.getDeclaredConstructor(IActivityManager.class, PrintWriter.class, InputStream.class,
String.class, boolean.class, boolean.class, String.class, boolean.class);
}
myActivityControllerConstructor.setAccessible(true); myActivityControllerConstructor.setAccessible(true);
myActivityControllerRunner = myActivityControllerClass.getDeclaredMethod("run"); myActivityControllerRunner = myActivityControllerClass.getDeclaredMethod("run");
myActivityControllerRunner.setAccessible(true); myActivityControllerRunner.setAccessible(true);
@ -91,18 +96,33 @@ public class ActivityController extends IActivityController.Stub {
String opt; String opt;
String gdbPort = null; String gdbPort = null;
boolean monkey = false; boolean monkey = false;
boolean simpleMode = false;
String target = null;
boolean alwaysContinue = false;
while ((opt = getNextOption()) != null) { while ((opt = getNextOption()) != null) {
if (opt.equals("--gdb")) { if (opt.equals("--gdb")) {
gdbPort = getNextArgRequired(); gdbPort = getNextArgRequired();
} else if (opt.equals("-m")) { } else if (opt.equals("-m")) {
monkey = true; monkey = true;
} else if (myActivityControllerConstructor.getParameterCount() > 5) {
switch (opt) {
case "-p":
target = getNextArgRequired();
break;
case "-s":
simpleMode = true;
break;
case "-c":
alwaysContinue = true;
break;
}
} else { } else {
getErrPrintWriter().println("Error: Unknown option: " + opt); getErrPrintWriter().println("Error: Unknown option: " + opt);
return -1; return -1;
} }
} }
return replaceMyControllerActivity(pw, getRawInputStream(), gdbPort, monkey); return replaceMyControllerActivity(pw, getRawInputStream(), gdbPort, monkey, simpleMode, target, alwaysContinue);
} }
@Override @Override
@ -141,7 +161,7 @@ public class ActivityController extends IActivityController.Stub {
return false; return false;
} }
static private int replaceMyControllerActivity(PrintWriter pw, InputStream stream, String gdbPort, boolean monkey) { static private int replaceMyControllerActivity(PrintWriter pw, InputStream stream, String gdbPort, boolean monkey, boolean simpleMode, String target, boolean alwaysContinue) {
try { try {
InvocationHandler handler = (proxy, method, args1) -> { InvocationHandler handler = (proxy, method, args1) -> {
if (method.getName().equals("setActivityController")) { if (method.getName().equals("setActivityController")) {
@ -155,7 +175,12 @@ public class ActivityController extends IActivityController.Stub {
}; };
var amProxy = Proxy.newProxyInstance(BridgeService.class.getClassLoader(), var amProxy = Proxy.newProxyInstance(BridgeService.class.getClassLoader(),
new Class[]{myActivityControllerConstructor.getParameterTypes()[0]}, handler); new Class[]{myActivityControllerConstructor.getParameterTypes()[0]}, handler);
var ctrl = myActivityControllerConstructor.newInstance(amProxy, pw, stream, gdbPort, monkey); Object ctrl;
if (myActivityControllerConstructor.getParameterCount() == 5) {
ctrl = myActivityControllerConstructor.newInstance(amProxy, pw, stream, gdbPort, monkey);
} else {
ctrl = myActivityControllerConstructor.newInstance(amProxy, pw, stream, gdbPort, monkey, simpleMode, target, alwaysContinue);
}
myActivityControllerRunner.invoke(ctrl); myActivityControllerRunner.invoke(ctrl);
return 0; return 0;
} catch (Throwable e) { } catch (Throwable e) {