RepoMirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy synced 2025-02-21 15:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not interrupt cleanup configuration

Browse Source 
Some options, such as --show-touches or --stay-awake, modify Android
settings and must be restored upon exit.

If scrcpy terminates (e.g. due to an early error) in the middle of the
clean up configuration, the device may be left in an inconsistent state
(some settings might be changed but not restored).

This issue can be reproduced with high probability by forcing scrcpy to
fail:

    scrcpy --show-touches --video-encoder=fail

To prevent this problem, ensure that the clean up thread is not
interrupted until the clean up process is started.

Refs #5601 <https://github.com/Genymobile/scrcpy/issues/5601>
PR #5613 <https://github.com/Genymobile/scrcpy/pull/5613>
This commit is contained in:
Romain Vimont 2024-12-05 19:56:53 +01:00
parent 6c6607d404
commit 2780e0bd7b
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ public final class CleanUp {
private boolean pendingRestoreDisplayPower;
private Thread thread;
private boolean interrupted;
private CleanUp(Options options) {
thread = new Thread(() -> runCleanUp(options), "cleanup");
@ -34,8 +35,10 @@ public final class CleanUp {
return new CleanUp(options);
}
public void interrupt() {
thread.interrupt();
public synchronized void interrupt() {
// Do not use thread.interrupt() because only the wait() call must be interrupted, not Command.exec()
interrupted = true;
notify();
}
public void join() throws InterruptedException {
@ -97,15 +100,13 @@ public final class CleanUp {
try {
run(displayId, restoreStayOn, disableShowTouches, powerOffScreen, restoreScreenOffTimeout);
} catch (InterruptedException e) {
// ignore
} catch (IOException e) {
Ln.e("Clean up I/O exception", e);
}
}
private void run(int displayId, int restoreStayOn, boolean disableShowTouches, boolean powerOffScreen, int restoreScreenOffTimeout)
throws IOException, InterruptedException {
throws IOException {
String[] cmd = {
"app_process",
"/",
@ -126,8 +127,15 @@ public final class CleanUp {
int localPendingChanges;
boolean localPendingRestoreDisplayPower;
synchronized (this) {
while (pendingChanges == 0) {
wait();
while (!interrupted && pendingChanges == 0) {
try {
wait();
} catch (InterruptedException e) {
throw new AssertionError("Clean up thread MUST NOT be interrupted");
}
}
if (interrupted) {
break;
}
localPendingChanges = pendingChanges;
localPendingRestoreDisplayPower = pendingRestoreDisplayPower;