Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev

Browse Source 
* commit '8f5228afe671b5e80fab4d1c55452ad6c83ef4f1':
  UsbMidiDevice: add timestamps for input events
This commit is contained in:
Phil Burk
2015-07-30 21:41:03 +00:00
committed by Android Git Automerger
parent 3eb4583600 8f5228afe6
commit e2823cb3db
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/usb/java/com/android/server/usb/UsbMidiDevice.java
View File

@@ -128,7 +128,7 @@ public final class UsbMidiDevice implements Closeable {
mReceiver = receiver;
}
}
public static UsbMidiDevice create(Context context, Bundle properties, int card, int device) {
// FIXME - support devices with different number of input and output ports
int subDeviceCount = nativeGetSubdeviceCount(card, device);
@@ -203,6 +203,8 @@ public final class UsbMidiDevice implements Closeable {
byte[] buffer = new byte[BUFFER_SIZE];
try {
while (true) {
// Record time of event immediately after waking.
long timestamp = System.nanoTime();
synchronized (mLock) {
if (!mIsOpen) break;
@@ -215,14 +217,14 @@ public final class UsbMidiDevice implements Closeable {
} else if ((pfd.revents & OsConstants.POLLIN) != 0) {
// clear readable flag
pfd.revents = 0;
if (index == mInputStreams.length - 1) {
// last file descriptor is used only for unblocking Os.poll()
break;
}
int count = mInputStreams[index].read(buffer);
outputReceivers[index].send(buffer, 0, count);
outputReceivers[index].send(buffer, 0, count, timestamp);
}
}
}