diff options
author | 2024-01-31 13:46:27 +0000 | |
---|---|---|
committer | 2024-01-31 13:46:27 +0000 | |
commit | 20736f94ba15165a1db89983613c198949fce9d9 (patch) | |
tree | 03f3003349d42168c6eef939ccd048306c4ea87c /services/surfaceflinger/DisplayDevice.cpp | |
parent | 6db9591465490047bcabba353668107b457a218c (diff) | |
parent | a109bb2ecea2c31f6d413f7c82805526f1d99d77 (diff) |
Merge changes I0fcfa426,I2f1510ec,I07d70dc8 into main
* changes:
SF: Fix error handling for getDisplayVsyncPeriod
SF: Handle BAD_CONFIG for getActiveConfig
FTL: Add Expected<T, E>
Diffstat (limited to 'services/surfaceflinger/DisplayDevice.cpp')
-rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 6 |
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(); |