Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sync with FrameTimelineInfo aidl migration"

Browse Source
This commit is contained in:
Huihong Luo
2022-04-09 05:26:35 +00:00
committed by Android (Google) Code Review
parent ee4aca3180 4fed9b4544
commit 922a804f22
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_view_SurfaceControl.cpp
View File

@@ -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,

6
native/android/surface_control.cpp
View File

@@ -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);
}