Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Terminate event controller thread on EOF

Browse source 
No exception was thrown on EOF, so the event controller did not
terminate. This leaded to a further InvocationTargetException.

Instead, terminate the event controller on EOF, so that the process
terminates properly.
This commit is contained in:
Romain Vimont 2018-02-16 14:13:13 +01:00
parent ad6209f6ff
commit 37af0c8076
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/src/main/java/com/genymobile/scrcpy/ControlEventReader.java
View file

@ -1,5 +1,6 @@
package com.genymobile.scrcpy; package com.genymobile.scrcpy;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -28,7 +29,7 @@ public class ControlEventReader {
return buffer.remaining() == rawBuffer.length; return buffer.remaining() == rawBuffer.length;
} }
public boolean readFrom(InputStream input) throws IOException { public void readFrom(InputStream input) throws IOException {
if (isFull()) { if (isFull()) {
throw new IllegalStateException("Buffer full, call next() to consume"); throw new IllegalStateException("Buffer full, call next() to consume");
} }
@ -36,11 +37,10 @@ public class ControlEventReader {
int head = buffer.position(); int head = buffer.position();
int r = input.read(rawBuffer, head, rawBuffer.length - head); int r = input.read(rawBuffer, head, rawBuffer.length - head);
if (r == -1) { if (r == -1) {
return false; throw new EOFException("Event controller socket closed");
} }
buffer.position(head + r); buffer.position(head + r);
buffer.flip(); buffer.flip();
return true;
} }
public ControlEvent next() { public ControlEvent next() {

8
server/src/main/java/com/genymobile/scrcpy/ScrCpyServer.java
View file

@ -1,7 +1,6 @@
package com.genymobile.scrcpy; package com.genymobile.scrcpy;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
public final class ScrCpyServer { public final class ScrCpyServer {
@ -63,13 +62,6 @@ public final class ScrCpyServer {
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
@Override @Override
public void uncaughtException(Thread t, Throwable e) { public void uncaughtException(Thread t, Throwable e) {
if (e instanceof AssertionError && e.getCause() instanceof InvocationTargetException) {
// WORKAROUND
// When we call a method of the framework by reflection, it may throw an InvocationTargetException
// (that we wrap into an AssertionError) if this process is being killed.
// To avoid the stacktrace on close, do not log these errors.
return;
}
Ln.e("Exception on thread " + t, e); Ln.e("Exception on thread " + t, e);
} }
}); });