Skip to content
This repository was archived by the owner on Jan 8, 2024. It is now read-only.

Commit 3591478

Browse files
committed
Fix reset native bridge
Fix #266
1 parent 2f71699 commit 3591478

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

rirud/src/main/java/riru/DaemonUtils.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class DaemonUtils {
4646
private static Boolean has32Bit = null, has64Bit = null;
4747
private static String originalNativeBridge;
4848
private static String devRandom;
49-
private static int ppid = -1;
5049
private static int magiskVersionCode = -1;
5150
private static String magiskTmpfsPath;
5251

@@ -70,10 +69,6 @@ public class DaemonUtils {
7069
private static final Set<Integer> zygotePid = Collections.newSetFromMap(new ConcurrentHashMap<>());
7170

7271
static {
73-
originalNativeBridge = SystemProperties.get("ro.dalvik.vm.native.bridge");
74-
if (TextUtils.isEmpty(originalNativeBridge)) {
75-
originalNativeBridge = "0";
76-
}
7772

7873
try {
7974
isSELinuxEnforcing = hasSELinux() && SELinux.isSELinuxEnabled() && SELinux.isSELinuxEnforced();
@@ -122,6 +117,11 @@ public class DaemonUtils {
122117
public static void init(String[] args) {
123118
magiskVersionCode = Integer.parseInt(args[0]);
124119
magiskTmpfsPath = args[1];
120+
if (args.length > 2) {
121+
originalNativeBridge = args[2];
122+
} else {
123+
originalNativeBridge = "0";
124+
}
125125
}
126126

127127
public static boolean isLoaded() {

template/magisk_module/post-fs-data.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ sed -Ei 's/^description=(\[.*][[:space:]]*)?/description=[ app_process fails to
77
export CLASSPATH=$MODDIR/rirud.apk
88
cd $MODDIR
99
flock "module.prop"
10-
unshare -m sh -c "/system/bin/app_process -Djava.class.path=rirud.apk /system/bin --nice-name=rirud riru.Daemon $(magisk -V) $(magisk --path) &"
10+
unshare -m sh -c "/system/bin/app_process -Djava.class.path=rirud.apk /system/bin --nice-name=rirud riru.Daemon $(magisk -V) $(magisk --path) $(getprop ro.dalvik.vm.native.bridge)&"

0 commit comments

Comments
 (0)