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

Fix parasitic manager state restore on 8.1 (#1726)

This commit is contained in:
南宫雪珊 2022-02-26 04:26:35 +08:00 committed by GitHub
parent 2ba199d68c
commit 97ef900125
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
View File

@ -116,7 +116,6 @@ public class ParasiticManagerHooker {
} }
}); });
var activityClientRecordClass = XposedHelpers.findClass("android.app.ActivityThread$ActivityClientRecord", ActivityThread.class.getClassLoader());
var activityHooker = new XC_MethodHook() { var activityHooker = new XC_MethodHook() {
@Override @Override
protected void beforeHookedMethod(MethodHookParam param) { protected void beforeHookedMethod(MethodHookParam param) {
@ -129,8 +128,30 @@ public class ParasiticManagerHooker {
if ("org.lsposed.manager.ui.activity.MainActivity".equals(activity.name)) { if ("org.lsposed.manager.ui.activity.MainActivity".equals(activity.name)) {
activity.applicationInfo = pkgInfo.applicationInfo; activity.applicationInfo = pkgInfo.applicationInfo;
param.args[i] = activity; 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) { if (param.args[i] instanceof Intent) {
var intent = (Intent) param.args[i]; var intent = (Intent) param.args[i];
@ -139,25 +160,8 @@ public class ParasiticManagerHooker {
} }
} }
} }
@Override
protected void afterHookedMethod(MethodHookParam param) {
for (var i = 0; i < param.args.length; ++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); XposedBridge.hookAllConstructors(activityClientRecordClass, activityHooker);
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) { if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {