From 7e47b3dd7d7f348859f8a23c1abcec8b18d55270 Mon Sep 17 00:00:00 2001 From: Rachel Lee Date: Wed, 12 Jan 2022 14:28:26 -0800 Subject: [PATCH] Use AVsyncId typedef. Test: atest ASurfaceControlTest Bug: 214063411 Change-Id: I5dd6a0e467f3acc46bf4ce65dde0df265b590697 --- native/android/choreographer.cpp | 2 +- native/android/surface_control.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/native/android/choreographer.cpp b/native/android/choreographer.cpp index deee5b173c214..5f18e1a6c4516 100644 --- a/native/android/choreographer.cpp +++ b/native/android/choreographer.cpp @@ -67,7 +67,7 @@ size_t AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex( const AChoreographerFrameCallbackData* data) { return AChoreographerFrameCallbackData_routeGetPreferredFrameTimelineIndex(data); } -int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId( +AVsyncId AChoreographerFrameCallbackData_getFrameTimelineVsyncId( const AChoreographerFrameCallbackData* data, size_t index) { return AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(data, index); } diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 5b19102334d91..d01a30e527491 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -661,7 +661,7 @@ void ASurfaceTransaction_setOnCommit(ASurfaceTransaction* aSurfaceTransaction, v } void ASurfaceTransaction_setFrameTimeline(ASurfaceTransaction* aSurfaceTransaction, - int64_t vsyncId) { + AVsyncId vsyncId) { CHECK_NOT_NULL(aSurfaceTransaction); // TODO(b/210043506): Get start time from platform. ASurfaceTransaction_to_Transaction(aSurfaceTransaction)