summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ady Abraham <adyabr@google.com> 2024-01-03 19:21:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-03 19:21:28 +0000
commit365716398f5955558ce7185ede55d923b7ed9781 (patch)
tree329e6bff89528481088f05a982a8518349d6e3f3
parent69505961330aa04346d1914c8e86112690d9f866 (diff)
parentae93c35401ffdf9701000fffb91e0aeaabcafcee (diff)
Merge "SF: don't store FrameTimeData for SetFrameRate" into main
-rw-r--r--services/surfaceflinger/Scheduler/LayerInfo.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/surfaceflinger/Scheduler/LayerInfo.cpp b/services/surfaceflinger/Scheduler/LayerInfo.cpp
index 97fca395b4..2dd3c62a4e 100644
--- a/services/surfaceflinger/Scheduler/LayerInfo.cpp
+++ b/services/surfaceflinger/Scheduler/LayerInfo.cpp
@@ -62,6 +62,10 @@ void LayerInfo::setLastPresentTime(nsecs_t lastPresentTime, nsecs_t now, LayerUp
mLastAnimationTime = std::max(lastPresentTime, now);
break;
case LayerUpdateType::SetFrameRate:
+ if (FlagManager::getInstance().vrr_config()) {
+ break;
+ }
+ FALLTHROUGH_INTENDED;
case LayerUpdateType::Buffer:
FrameTimeData frameTime = {.presentTime = lastPresentTime,
.queueTime = mLastUpdatedTime,