commit 8d0c61014f716f945ee64415e95bdd28365320a0
author Rachel Lee <rnlee@google.com> Wed Nov 03 22:00:25 2021 +0000
committer Rachel Lee <rnlee@google.com> Thu Nov 04 12:48:22 2021 -0700
tree ff920abf728792fee31beb29932cd6d7bf2bb2f8
parent 3f0286607e9d35196fdff27f84381dffb7bafcad

Send multiple scheduler frame timelines (fix).

Fix the revert and added extra unit test asserts (fail on previous CL
but passes on this CL!!).

Bug: 198192508
Bug: 204941507
Test: atest EventThreadTest; atest ChoreographerNativeTest

Change-Id: Ib9d8df901fab72cae2cee86692d983c6e02d9c2c

services/surfaceflinger/Scheduler/EventThread.h

diff --git a/services/surfaceflinger/Scheduler/EventThread.h b/services/surfaceflinger/Scheduler/EventThread.h
index 73ae5dc..de43570 100644
--- a/services/surfaceflinger/Scheduler/EventThread.h
+++ b/services/surfaceflinger/Scheduler/EventThread.h
@@ -204,8 +204,8 @@
     void onVSyncEvent(nsecs_t timestamp, nsecs_t expectedVSyncTimestamp,
                       nsecs_t deadlineTimestamp) override;
 
-    int64_t generateToken(nsecs_t timestamp, nsecs_t expectedVSyncTimestamp,
-                          nsecs_t deadlineTimestamp) const;
+    int64_t generateToken(nsecs_t timestamp, nsecs_t deadlineTimestamp,
+                          nsecs_t expectedVSyncTimestamp) const;
     void generateFrameTimeline(DisplayEventReceiver::Event& event) const;
 
     const std::unique_ptr<VSyncSource> mVSyncSource GUARDED_BY(mMutex);