Use more general DataOutput instead of DataOutputStream where possible

This commit is contained in:
Jano Svitok 2018-08-06 11:12:43 +02:00
parent c39c0d16ee
commit b255b3b618

View File

@ -80,7 +80,7 @@ class AdbProtocolHandler implements Runnable {
return true; return true;
} }
private void hostSerial(DataOutputStream output, String command) throws IOException { private void hostSerial(DataOutput output, String command) throws IOException {
String[] strs = command.split(":",0); String[] strs = command.split(":",0);
if (strs.length != 3) { if (strs.length != 3) {
throw new ProtocolException("Invalid command: " + command); throw new ProtocolException("Invalid command: " + command);
@ -102,7 +102,7 @@ class AdbProtocolHandler implements Runnable {
} }
} }
private void hostGetState(DataOutputStream output) throws IOException { private void hostGetState(DataOutput output) throws IOException {
// TODO: Check so that exactly one device is selected. // TODO: Check so that exactly one device is selected.
AdbDeviceResponder device = responder.getDevices().get(0); AdbDeviceResponder device = responder.getDevices().get(0);
output.writeBytes("OKAY"); output.writeBytes("OKAY");
@ -115,13 +115,13 @@ class AdbProtocolHandler implements Runnable {
shell(shellCommand, output, input); shell(shellCommand, output, input);
} }
private void hostTransport(DataOutputStream output, String command) throws IOException { private void hostTransport(DataOutput output, String command) throws IOException {
String serial = command.substring("host:transport:".length()); String serial = command.substring("host:transport:".length());
selected = findDevice(serial); selected = findDevice(serial);
output.writeBytes("OKAY"); output.writeBytes("OKAY");
} }
private void hostDevices(DataOutputStream output) throws IOException { private void hostDevices(DataOutput output) throws IOException {
ByteArrayOutputStream tmp = new ByteArrayOutputStream(); ByteArrayOutputStream tmp = new ByteArrayOutputStream();
DataOutputStream writer = new DataOutputStream(tmp); DataOutputStream writer = new DataOutputStream(tmp);
for (AdbDeviceResponder d : responder.getDevices()) { for (AdbDeviceResponder d : responder.getDevices()) {
@ -131,13 +131,13 @@ class AdbProtocolHandler implements Runnable {
send(output, new String(tmp.toByteArray(), StandardCharsets.UTF_8)); send(output, new String(tmp.toByteArray(), StandardCharsets.UTF_8));
} }
private void hostTransportAny(DataOutputStream output) throws IOException { private void hostTransportAny(DataOutput output) throws IOException {
// TODO: Check so that exactly one device is selected. // TODO: Check so that exactly one device is selected.
selected = responder.getDevices().get(0); selected = responder.getDevices().get(0);
output.writeBytes("OKAY"); output.writeBytes("OKAY");
} }
private void hostVersion(DataOutputStream output) throws IOException { private void hostVersion(DataOutput output) throws IOException {
output.writeBytes("OKAY"); output.writeBytes("OKAY");
send(output, String.format("%04x", responder.getVersion())); send(output, String.format("%04x", responder.getVersion()));
} }