summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/BufferQueueLayer.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-01-24 17:26:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-01-24 17:26:34 +0000
commit9c2cc9d24d98a71e537ec90a81a0f74f18016185 (patch)
tree80f8509beefe98804c20a4a886d79d7cef7dab3f /services/surfaceflinger/BufferQueueLayer.cpp
parent2f56c9c4a6a8decfc84cf329ef985c46ff0f03cf (diff)
parent8a82ba66a22238fe59c02a6309ba8bd3dae4f074 (diff)
Merge "SurfaceFlinger: enhance refresh rate selection"
Diffstat (limited to 'services/surfaceflinger/BufferQueueLayer.cpp')
-rw-r--r--services/surfaceflinger/BufferQueueLayer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index b55e62b88c..e85281d8a9 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -129,8 +129,11 @@ bool BufferQueueLayer::setFrameRate(float frameRate) {
return frameRateChanged;
}
-float BufferQueueLayer::getFrameRate() const {
- return mLatchedFrameRate;
+std::optional<float> BufferQueueLayer::getFrameRate() const {
+ if (mLatchedFrameRate > 0.f || mLatchedFrameRate == FRAME_RATE_NO_VOTE)
+ return mLatchedFrameRate;
+
+ return {};
}
// -----------------------------------------------------------------------