summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/DisplayDevice.cpp
diff options
context:
space:
mode:
author Dominik Laskowski <domlaskowski@google.com> 2024-01-28 13:33:51 -0500
committer Dominik Laskowski <domlaskowski@google.com> 2024-01-30 15:22:18 -0500
commita109bb2ecea2c31f6d413f7c82805526f1d99d77 (patch)
treed98aff1d637dce07ac16d1032c46e798f59edb8c /services/surfaceflinger/DisplayDevice.cpp
parentd940a01372501c7e84ec865a52d483735abc90b3 (diff)
SF: Fix error handling for getDisplayVsyncPeriod
HWC errors were being converted to a status_t of NO_ERROR. Bug: 241285876 Test: presubmit Change-Id: I0fcfa426c795adf55a920729bc613a0cd140e87c
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
-rw-r--r--services/surfaceflinger/DisplayDevice.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index 4f81482814..5f20cd9c87 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -239,10 +239,8 @@ nsecs_t DisplayDevice::getVsyncPeriodFromHWC() const {
return 0;
}
- nsecs_t vsyncPeriod;
- const auto status = mHwComposer.getDisplayVsyncPeriod(physicalId, &vsyncPeriod);
- if (status == NO_ERROR) {
- return vsyncPeriod;
+ if (const auto vsyncPeriodOpt = mHwComposer.getDisplayVsyncPeriod(physicalId).value_opt()) {
+ return *vsyncPeriodOpt;
}
return refreshRateSelector().getActiveMode().modePtr->getVsyncRate().getPeriodNsecs();