commit 4fed9b4544a6f8e1819dfde45bc6d8eeeb89aa2e
author Huihong Luo <huisinro@google.com> Thu Mar 03 15:10:33 2022 -0800
committer Huihong Luo <huisinro@google.com> Tue Apr 05 15:20:02 2022 -0700
tree dcf73180f84113956c94a0317c079db7df98e286
parent fd71eebcd3a60a1e0f1dfaf76ae738ef8315a616

Sync with FrameTimelineInfo aidl migration

libgui FrameTimelineInfo has been converted to aidl  parcelable.

Bug: 222537482
Test: atest libgui_test libsurfaceflinger_unittest SurfaceFlinger_test
Change-Id: I6bf8433d7786485faef61633917659cca5d7f512

core/jni/android_view_SurfaceControl.cpp

diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 518fc09..72a1e04 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -1950,8 +1950,10 @@
                                         jlong frameTimelineVsyncId) {
     auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
 
-    transaction->setFrameTimelineInfo(
-            {frameTimelineVsyncId, android::os::IInputConstants::INVALID_INPUT_EVENT_ID});
+    FrameTimelineInfo ftInfo;
+    ftInfo.vsyncId = frameTimelineVsyncId;
+    ftInfo.inputEventId = android::os::IInputConstants::INVALID_INPUT_EVENT_ID;
+    transaction->setFrameTimelineInfo(ftInfo);
 }
 
 static void nativeAddTransactionCommittedListener(JNIEnv* env, jclass clazz, jlong transactionObj,

native/android/surface_control.cpp

diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 1ebdc27..98edcc3 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -669,6 +669,8 @@
                                           AVsyncId vsyncId) {
     CHECK_NOT_NULL(aSurfaceTransaction);
     const auto startTime = AChoreographer_getStartTimeNanosForVsyncId(vsyncId);
-    ASurfaceTransaction_to_Transaction(aSurfaceTransaction)
-            ->setFrameTimelineInfo({.vsyncId = vsyncId, .startTimeNanos = startTime});
+    FrameTimelineInfo ftInfo;
+    ftInfo.vsyncId = vsyncId;
+    ftInfo.startTimeNanos = startTime;
+    ASurfaceTransaction_to_Transaction(aSurfaceTransaction)->setFrameTimelineInfo(ftInfo);
 }