Ensure auto restart works

RikkaApps · Jan 12, 2021 · 600ac35 · 600ac35
1 parent 6a0262a
commit 600ac35
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/riru/src/main/java/riru/Daemon.java b/riru/src/main/java/riru/Daemon.java
@@ -76,6 +76,8 @@ private void startWait(boolean allowRestart, boolean isFirst) {
 
         try {
             binder.linkToDeath(() -> {
+                DaemonUtils.deleteDevFolder();
+
                 Log.i(TAG, "Zygote is probably dead, restart rirud socket...");
                 DaemonUtils.startSocket(DaemonUtils.findNativeDaemonPid());
 

diff --git a/riru/src/main/java/riru/DaemonUtils.java b/riru/src/main/java/riru/DaemonUtils.java
@@ -61,7 +61,7 @@ public static IBinder waitForSystemService(String name) {
         } while (true);
     }
 
-    public static boolean isRiruLoaded() {
+    public static String getRiruRandom() {
         String devRandom = null;
         try (BufferedReader br = new BufferedReader(new FileReader(new File("/data/adb/riru/dev_random")))) {
             char[] buf = new char[4096];
@@ -72,14 +72,27 @@ public static boolean isRiruLoaded() {
         } catch (IOException e) {
             Log.w(Daemon.TAG, "Can't read dev_random.", e);
         }
+        return devRandom;
+    }
 
+    public static boolean isRiruLoaded() {
+        String devRandom = getRiruRandom();
         if (devRandom == null) {
             return false;
         }
 
         return new File("/dev/riru_" + devRandom).exists();
     }
 
+    public static boolean deleteDevFolder() {
+        String devRandom = getRiruRandom();
+        if (devRandom == null) {
+            return false;
+        }
+
+        return new File("/dev/riru_" + devRandom).delete();
+    }
+
     public static int findNativeDaemonPid() {
         File proc = new File("/proc");