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

Merge changes from topic "achoreonanos"

Browse Source 
* changes:
  Update hwui with renamed AChoreographer method.
  Update libandroid renamed AChoreographer methods.
This commit is contained in:
Rachel Lee
2022-01-13 22:44:31 +00:00
committed by Android (Google) Code Review
parent 24f7505d0b 3712a2a7c0
commit 4832a69444
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/renderthread/RenderThread.cpp
View File

@@ -119,7 +119,7 @@ void RenderThread::extendedFrameCallback(const AChoreographerFrameCallbackData*
AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex(cbData);
int64_t vsyncId = AChoreographerFrameCallbackData_getFrameTimelineVsyncId(
cbData, preferredFrameTimelineIndex);
int64_t frameDeadline = AChoreographerFrameCallbackData_getFrameTimelineDeadline(
int64_t frameDeadline = AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(
cbData, preferredFrameTimelineIndex);
int64_t frameTimeNanos = AChoreographerFrameCallbackData_getFrameTimeNanos(cbData);
// TODO(b/193273294): Remove when shared memory in use w/ expected present time always current.

9
native/android/choreographer.cpp
View File

@@ -71,11 +71,12 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineVsyncId(
const AChoreographerFrameCallbackData* data, size_t index) {
return AChoreographerFrameCallbackData_routeGetFrameTimelineVsyncId(data, index);
}
int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime(
int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos(
const AChoreographerFrameCallbackData* data, size_t index) {
return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTime(data, index);
return AChoreographerFrameCallbackData_routeGetFrameTimelineExpectedPresentTimeNanos(data,
index);
}
int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadline(
int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(
const AChoreographerFrameCallbackData* data, size_t index) {
return AChoreographerFrameCallbackData_routeGetFrameTimelineDeadline(data, index);
return AChoreographerFrameCallbackData_routeGetFrameTimelineDeadlineNanos(data, index);
}

4
native/android/libandroid.map.txt
View File

@@ -34,8 +34,8 @@ LIBANDROID {
AChoreographerFrameCallbackData_getFrameTimelinesLength; # introduced=33
AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex; # introduced=33
AChoreographerFrameCallbackData_getFrameTimelineVsyncId; # introduced=33
AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTime; # introduced=33
AChoreographerFrameCallbackData_getFrameTimelineDeadline; # introduced=33
AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentTimeNanos; # introduced=33
AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos; # introduced=33
AConfiguration_copy;
AConfiguration_delete;
AConfiguration_diff;