summaryrefslogtreecommitdiffstats
path: root/services/usb/java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-03-14 00:48:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-14 00:49:00 +0000
commit3ae6acda814cc129b03abf5e418a115813321b06 (patch)
treeaf9a393e845bc35566f65e1cadd5177e9c8ef408 /services/usb/java
parentb9b8aef94e5bad8f5f03f686a2d3d8a09c045a7b (diff)
parent81b9f7d325a552c54e793b51f571ae3d65b26e94 (diff)
downloadframeworks_base-3ae6acda814cc129b03abf5e418a115813321b06.zip
frameworks_base-3ae6acda814cc129b03abf5e418a115813321b06.tar.gz
frameworks_base-3ae6acda814cc129b03abf5e418a115813321b06.tar.bz2
Merge "Add MidiManager to public API"
Diffstat (limited to 'services/usb/java')
-rw-r--r--services/usb/java/com/android/server/usb/UsbMidiDevice.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbMidiDevice.java b/services/usb/java/com/android/server/usb/UsbMidiDevice.java
index df6cfbf..f23bb93 100644
--- a/services/usb/java/com/android/server/usb/UsbMidiDevice.java
+++ b/services/usb/java/com/android/server/usb/UsbMidiDevice.java
@@ -103,7 +103,7 @@ public final class UsbMidiDevice implements Closeable {
final int portF = port;
mInputPortReceivers[port] = new MidiReceiver() {
@Override
- public void receive(byte[] data, int offset, int count, long timestamp)
+ public void onReceive(byte[] data, int offset, int count, long timestamp)
throws IOException {
// FIXME - timestamps are ignored, future posting not supported yet.
mOutputStreams[portF].write(data, offset, count);
@@ -143,8 +143,7 @@ public final class UsbMidiDevice implements Closeable {
pfd.revents = 0;
int count = mInputStreams[index].read(buffer);
- long timestamp = System.nanoTime();
- outputReceivers[index].send(buffer, 0, count, timestamp);
+ outputReceivers[index].send(buffer, 0, count);
} else if ((pfd.revents & (OsConstants.POLLERR
| OsConstants.POLLHUP)) != 0) {
done = true;