drgreen/scrcpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Start cleanup process with setsid or nohup"

Browse Source 
This reverts commit c59a3c3169973abb4ce236e06990d58ae6567481.

The next commit will use Os.setsid() instead.
This commit is contained in:
Romain Vimont 2024-12-09 09:29:29 +01:00
parent 65256d7cc7
commit 28b5bfb90e
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/src/main/java/com/genymobile/scrcpy/CleanUp.java
View File

@ -10,8 +10,6 @@ import android.os.BatteryManager;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
/** /**
* Handle the cleanup of scrcpy, even if the main process is killed. * Handle the cleanup of scrcpy, even if the main process is killed.
@ -109,22 +107,16 @@ public final class CleanUp {
private void run(int displayId, int restoreStayOn, boolean disableShowTouches, boolean powerOffScreen, int restoreScreenOffTimeout) private void run(int displayId, int restoreStayOn, boolean disableShowTouches, boolean powerOffScreen, int restoreScreenOffTimeout)
throws IOException { throws IOException {
String[] cmd = {
List<String> cmd = new ArrayList<>(); "app_process",
if (new File("/system/bin/setsid").exists()) { "/",
cmd.add("/system/bin/setsid"); CleanUp.class.getName(),
} else if (new File("/system/bin/nohup").exists()) { String.valueOf(displayId),
cmd.add("/system/bin/nohup"); String.valueOf(restoreStayOn),
} String.valueOf(disableShowTouches),
String.valueOf(powerOffScreen),
cmd.add("app_process"); String.valueOf(restoreScreenOffTimeout),
cmd.add("/"); };
cmd.add(CleanUp.class.getName());
cmd.add(String.valueOf(displayId));
cmd.add(String.valueOf(restoreStayOn));
cmd.add(String.valueOf(disableShowTouches));
cmd.add(String.valueOf(powerOffScreen));
cmd.add(String.valueOf(restoreScreenOffTimeout));
ProcessBuilder builder = new ProcessBuilder(cmd); ProcessBuilder builder = new ProcessBuilder(cmd);
builder.environment().put("CLASSPATH", Server.SERVER_PATH); builder.environment().put("CLASSPATH", Server.SERVER_PATH);