mirrors/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-04-19 19:15:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log controller handling errors

Browse source 
On close, the controller is expected to throw an IOException because the
socket is closed, so the exception was ignored.

However, message handling actions may also throw IOException, and they
must not be silently ignored.

PR #4473 <https://github.com/Genymobile/scrcpy/pull/4473>
This commit is contained in:
Romain Vimont 2024-02-26 10:20:01 +01:00
parent 604e59ac7b
commit 4d5b67cc80
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/src/main/java/com/genymobile/scrcpy/Controller.java
View file

@ -81,8 +81,9 @@ public class Controller implements AsyncProcessor {
SystemClock.sleep(500);
}
while (!Thread.currentThread().isInterrupted()) {
handleEvent();
boolean alive = true;
while (!Thread.currentThread().isInterrupted() && alive) {
alive = handleEvent();
}
}
@ -92,7 +93,7 @@ public class Controller implements AsyncProcessor {
try {
control();
} catch (IOException e) {
// this is expected on close
Ln.e("Controller error", e);
} finally {
Ln.d("Controller stopped");
listener.onTerminated(true);
@ -122,8 +123,15 @@ public class Controller implements AsyncProcessor {
return sender;
}
private void handleEvent() throws IOException {
ControlMessage msg = controlChannel.recv();
private boolean handleEvent() throws IOException {
ControlMessage msg;
try {
msg = controlChannel.recv();
} catch (IOException e) {
// this is expected on close
return false;
}
switch (msg.getType()) {
case ControlMessage.TYPE_INJECT_KEYCODE:
if (device.supportsInputEvents()) {
@ -185,6 +193,8 @@ public class Controller implements AsyncProcessor {
default:
// do nothing
}
return true;
}
private boolean injectKeycode(int action, int keycode, int repeat, int metaState) {