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

Fix state loading (#1911) 

* Revert "Fix parasitic manager state restore on 8.1 (#1726)"

This reverts commit 97ef900125.

* Fix state loading

Co-authored-by: Howard Wu <40033067+Howard20181@users.noreply.github.com>
This commit is contained in:
LoveSy 2022-05-03 23:15:39 +08:00 committed by GitHub
parent c63fb7af37
commit 779c178d0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
magisk-loader/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
View File

@ -20,12 +20,13 @@ import android.os.PersistableBundle;
import android.os.Process;
import android.os.RemoteException;
import android.util.AndroidRuntimeException;
import android.util.ArrayMap;
import android.webkit.WebViewDelegate;
import android.webkit.WebViewFactory;
import android.webkit.WebViewFactoryProvider;
import org.lsposed.lspd.ILSPManagerService;
import org.lsposed.lspd.BuildConfig;
import org.lsposed.lspd.ILSPManagerService;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@ -116,6 +117,7 @@ public class ParasiticManagerHooker {
}
});
var activityClientRecordClass = XposedHelpers.findClass("android.app.ActivityThread$ActivityClientRecord", ActivityThread.class.getClassLoader());
var activityHooker = new XC_MethodHook() {
@Override
protected void beforeHookedMethod(MethodHookParam param) {
@ -128,30 +130,8 @@ public class ParasiticManagerHooker {
if ("org.lsposed.manager.ui.activity.MainActivity".equals(activity.name)) {
activity.applicationInfo = pkgInfo.applicationInfo;
param.args[i] = activity;
break;
}
}
for (var j = 0; j < param.args.length; ++j) {
if (param.args[j] instanceof Bundle) {
Hookers.logD("loading state of " + aInfo.name);
int stateId = j;
states.computeIfPresent(aInfo.name, (k, v) -> {
param.args[stateId] = v;
return v;
});
continue;
}
if (param.args[j] instanceof PersistableBundle) {
Hookers.logD("loading persistentState of " + aInfo.name);
int persistentStateId = j;
states.computeIfPresent(aInfo.name, (k, v) -> {
param.args[persistentStateId] = v;
return v;
});
}
}
continue;
}
if (param.args[i] instanceof Intent) {
var intent = (Intent) param.args[i];
@ -159,9 +139,49 @@ public class ParasiticManagerHooker {
intent.setComponent(new ComponentName(intent.getComponent().getPackageName(), "org.lsposed.manager.ui.activity.MainActivity"));
}
}
if (param.method.getName().equals("scheduleLaunchActivity")) {
ActivityInfo aInfo = null;
var parameters = ((Method)param.method).getParameterTypes();
for (var i = 0; i < parameters.length; ++i) {
if (parameters[i] == ActivityInfo.class) {
aInfo = (ActivityInfo) param.args[i];
Hookers.logD("loading state of " + aInfo.name);
} else if (parameters[i] == Bundle.class && aInfo != null) {
final int idx = i;
states.computeIfPresent(aInfo.name, (k, v) -> {
param.args[idx] = v;
return v;
});
} else if (parameters[i] == PersistableBundle.class && aInfo != null) {
final int idx = i;
persistentStates.computeIfPresent(aInfo.name, (k, v) -> {
param.args[idx] = v;
return v;
});
}
}
}
}
@Override
protected void afterHookedMethod(MethodHookParam param) {
for (var i = 0; i < param.args.length && activityClientRecordClass.isInstance(param.thisObject); ++i) {
if (param.args[i] instanceof ActivityInfo) {
var aInfo = (ActivityInfo) param.args[i];
Hookers.logD("loading state of " + aInfo.name);
states.computeIfPresent(aInfo.name, (k, v) -> {
XposedHelpers.setObjectField(param.thisObject, "state", v);
return v;
});
persistentStates.computeIfPresent(aInfo.name, (k, v) -> {
XposedHelpers.setObjectField(param.thisObject, "persistentState", v);
return v;
});
}
}
}
};
var activityClientRecordClass = XposedHelpers.findClass("android.app.ActivityThread$ActivityClientRecord", ActivityThread.class.getClassLoader());
XposedBridge.hookAllConstructors(activityClientRecordClass, activityHooker);
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
@ -218,8 +238,8 @@ public class ParasiticManagerHooker {
@Override
protected void beforeHookedMethod(MethodHookParam param) {
if (param.args[1] == null) return;
for (var intent : (List<Intent>) param.args[1]) {
checkIntent(managerService, intent);
for (var intent : (List<?>) param.args[1]) {
checkIntent(managerService, (Intent) intent);
}
}
});
@ -254,14 +274,19 @@ public class ParasiticManagerHooker {
}
}
});
XposedBridge.hookAllMethods(ActivityThread.class, "performStopActivityInner", new XC_MethodHook() {
var stateHooker = new XC_MethodHook() {
@Override
protected void beforeHookedMethod(MethodHookParam param) {
try {
XposedHelpers.callMethod(param.thisObject, Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ? "callActivityOnSaveInstanceState" : "callCallActivityOnSaveInstanceState", param.args[0]);
var state = (Bundle) XposedHelpers.getObjectField(param.args[0], "state");
var persistentState = (PersistableBundle) XposedHelpers.getObjectField(param.args[0], "persistentState");
var aInfo = (ActivityInfo) XposedHelpers.getObjectField(param.args[0], "activityInfo");
var record = param.args[0];
if (record instanceof IBinder) {
record = ((ArrayMap<?, ?>) XposedHelpers.getObjectField(param.thisObject, "mActivities")).get(record);
if (record == null) return;
}
XposedHelpers.callMethod(param.thisObject, Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ? "callActivityOnSaveInstanceState" : "callCallActivityOnSaveInstanceState", record);
var state = (Bundle) XposedHelpers.getObjectField(record, "state");
var persistentState = (PersistableBundle) XposedHelpers.getObjectField(record, "persistentState");
var aInfo = (ActivityInfo) XposedHelpers.getObjectField(record, "activityInfo");
states.compute(aInfo.name, (k, v) -> state);
persistentStates.compute(aInfo.name, (k, v) -> persistentState);
Hookers.logD("saving state of " + aInfo.name);
@ -269,7 +294,9 @@ public class ParasiticManagerHooker {
Hookers.logE("save state", e);
}
}
});
};
XposedBridge.hookAllMethods(ActivityThread.class, "performStopActivityInner", stateHooker);
XposedHelpers.findAndHookMethod(ActivityThread.class, "performDestroyActivity", IBinder.class, boolean.class, int.class, boolean.class, stateHooker);
}
private static void checkIntent(ILSPManagerService managerService, Intent intent) {