commit e2823cb3dbe15d1c3dbd6253f28982765a7451d5
author Phil Burk <philburk@google.com> Thu Jul 30 21:41:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 30 21:41:03 2015 +0000
tree c2f44451b6650cc2ae5cd6a9d7c8d00effb29d67
parent 3eb45836003e92830ff423f9260ce326e6e7f607
parent 8f5228afe671b5e80fab4d1c55452ad6c83ef4f1

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

* commit '8f5228afe671b5e80fab4d1c55452ad6c83ef4f1':
  UsbMidiDevice: add timestamps for input events

services/usb/java/com/android/server/usb/UsbMidiDevice.java

diff --git a/services/usb/java/com/android/server/usb/UsbMidiDevice.java b/services/usb/java/com/android/server/usb/UsbMidiDevice.java
index 97bf505..38ede87 100644
--- a/services/usb/java/com/android/server/usb/UsbMidiDevice.java
+++ b/services/usb/java/com/android/server/usb/UsbMidiDevice.java
@@ -128,7 +128,7 @@
             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 @@
                 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 @@
                                 } 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);
                                 }
                             }
                         }