summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/jni/android_view_SurfaceControl.cpp6
-rw-r--r--native/android/surface_control.cpp6
2 files changed, 8 insertions, 4 deletions
diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp
index 518fc09dee5a..72a1e04e5e5f 100644
--- a/core/jni/android_view_SurfaceControl.cpp
+++ b/core/jni/android_view_SurfaceControl.cpp
@@ -1950,8 +1950,10 @@ static void nativeSetFrameTimelineVsync(JNIEnv* env, jclass clazz, jlong transac
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,
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 1ebdc273931b..98edcc30f985 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -669,6 +669,8 @@ void ASurfaceTransaction_setFrameTimeline(ASurfaceTransaction* aSurfaceTransacti
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);
}