Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b434eb94 authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge "uinput: fix timestamps for JSON-style recordings" into main

parents 2f7b4771 24cff7df
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class Device {
                        break;
                    }
                    long offsetMicros = args.argl1;
                    if (mLastInjectTimestampMicros == -1 || offsetMicros == -1) {
                    if (mLastInjectTimestampMicros == -1) {
                        // There's often a delay of a few milliseconds between the time specified to
                        // Handler.sendMessageAtTime and the handler actually being called, due to
                        // the way threads are scheduled. We don't take this into account when
@@ -239,6 +239,9 @@ public class Device {
                        // To prevent this, we need to use the time at which we scheduled this first
                        // batch, rather than the actual current time.
                        mLastInjectTimestampMicros = args.argl2 / 1000;
                    } else if (offsetMicros == -1) {
                        // No timestamp offset is specified for this event, so use the current time.
                        mLastInjectTimestampMicros = SystemClock.uptimeNanos() / 1000;
                    } else {
                        mLastInjectTimestampMicros += offsetMicros;
                    }