summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-02-22 19:45:15 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-02-22 19:45:15 +0000
commit64e171f47c921e1cd10afb9f735c3bf6a489f31b (patch)
tree4f7995b22c81aaaaaf0e6a23f26f9c61072ba7c7
parent993662b3235582e6c097ac87a6c0d0f9c3e414fe (diff)
parentc9da3f7848f5a06cd43460687fb5121d3a929fca (diff)
Merge "USB MIDI: Fix incorrect timestamps" into udc-dev
-rw-r--r--services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java b/services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java
index 394d6e774aa1..0dcf8ce96192 100644
--- a/services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java
+++ b/services/usb/java/com/android/server/usb/UsbDirectMidiDevice.java
@@ -379,8 +379,6 @@ public final class UsbDirectMidiDevice implements Closeable {
Log.w(TAG, "input thread interrupted");
break;
}
- // Record time of event immediately after waking.
- long timestamp = System.nanoTime();
final ByteBuffer byteBuffer = ByteBuffer.wrap(inputBuffer);
if (!request.queue(byteBuffer)) {
Log.w(TAG, "Cannot queue request");
@@ -396,6 +394,9 @@ public final class UsbDirectMidiDevice implements Closeable {
continue;
}
+ // Record time of event after receiving response.
+ long timestamp = System.nanoTime();
+
int bytesRead = byteBuffer.position();
if (bytesRead > 0) {