Misc change

rirud/src/main/java/riru/Daemon.java

@@ -20,16 +20,19 @@ public class Daemon implements IBinder.DeathRecipient {
     private static final String RIRU_LOADER = "libriruloader.so";
 
     private final Handler handler = new Handler(Looper.myLooper());
-    private final DaemonSocketServerThread serverThread = new DaemonSocketServerThread();
+    private static final DaemonSocketServerThread serverThread = new DaemonSocketServerThread();
 
     private boolean allowRestart = true;
 
     private IBinder systemServerBinder;
 
+    static {
+        serverThread.start();
+    }
+
     public Daemon() {
         // prevent zygote died after system server starts but before onRiruLoaded called
         synchronized (serverThread) {
-            serverThread.start();
             handler.post(() -> startWait(true));
         }
     }

rirud/src/main/java/riru/DaemonSocketServerThread.java

@@ -1,5 +1,6 @@
 package riru;
 
+import static android.system.OsConstants.EINVAL;
 import static riru.Daemon.TAG;
 
 import android.net.Credentials;
@@ -24,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -346,6 +348,11 @@ private void startServer() throws IOException {
             try {
                 socket = serverSocket.accept();
             } catch (IOException e) {
+                if ((e.getCause() != null && e.getCause() instanceof ErrnoException && ((ErrnoException) e.getCause()).errno == EINVAL) ||
+                        (e.getMessage() != null && (e.getMessage().contains("EINVAL") || e.getMessage().contains(String.format(Locale.ROOT, "errno %d", EINVAL))))) {
+                    Log.i(TAG, "Server shutdown.");
+                    return;
+                }
                 Log.w(TAG, "Accept failed, server is closed ?", e);
                 return;
             }

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

@@ -68,8 +68,14 @@ public class DaemonUtils {
 
     private static final Set<Integer> zygotePid = Collections.newSetFromMap(new ConcurrentHashMap<>());
 
-    static {
-
+    public static void init(String[] args) {
+        magiskVersionCode = Integer.parseInt(args[0]);
+        magiskTmpfsPath = args[1];
+        if (args.length > 2) {
+            originalNativeBridge = args[2];
+        } else {
+            originalNativeBridge = "0";
+        }
         try {
             isSELinuxEnforcing = hasSELinux() && SELinux.isSELinuxEnabled() && SELinux.isSELinuxEnforced();
         } catch (Throwable e) {
@@ -114,16 +120,6 @@ public class DaemonUtils {
         }
     }
 
-    public static void init(String[] args) {
-        magiskVersionCode = Integer.parseInt(args[0]);
-        magiskTmpfsPath = args[1];
-        if (args.length > 2) {
-            originalNativeBridge = args[2];
-        } else {
-            originalNativeBridge = "0";
-        }
-    }
-
     public static boolean isLoaded() {
         var processes = new File("/proc").listFiles((file, s) -> TextUtils.isDigitsOnly(s));
         if (processes == null) {