diff options
| author | 2022-01-26 19:19:17 -0800 | |
|---|---|---|
| committer | 2022-02-08 18:53:39 -0800 | |
| commit | de549d4fe45b5af63bed7ac93adeb9a2715464db (patch) | |
| tree | 552f10cda7784dfc6a3ccd61625cb738075698cc /services/surfaceflinger/SurfaceFlinger.cpp | |
| parent | 8fd90ad372a5f75ed23ca8a784432689939f67c2 (diff) | |
SF: use aidl Capability
Bug: 198190384
Test: SF unit tests
Change-Id: I73fe0cc15dabdd4703de068a9cebd878d76e39d7
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 5ccb5ebb8f..b76233c59f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -163,6 +163,7 @@ #define NO_THREAD_SAFETY_ANALYSIS \ _Pragma("GCC error \"Prefer MAIN_THREAD macros or {Conditional,Timed,Unnecessary}Lock.\"") +using aidl::android::hardware::graphics::composer3::Capability; using aidl::android::hardware::graphics::composer3::DisplayCapability; namespace android { @@ -891,7 +892,7 @@ void SurfaceFlinger::init() { // Inform native graphics APIs whether the present timestamp is supported: const bool presentFenceReliable = - !getHwComposer().hasCapability(hal::Capability::PRESENT_FENCE_IS_NOT_RELIABLE); + !getHwComposer().hasCapability(Capability::PRESENT_FENCE_IS_NOT_RELIABLE); mStartPropertySetThread = getFactory().createStartPropertySetThread(presentFenceReliable); if (mStartPropertySetThread->Start() != NO_ERROR) { @@ -955,7 +956,7 @@ status_t SurfaceFlinger::getSupportedFrameTimestamps( }; ConditionalLock _l(mStateLock, std::this_thread::get_id() != mMainThreadId); - if (!getHwComposer().hasCapability(hal::Capability::PRESENT_FENCE_IS_NOT_RELIABLE)) { + if (!getHwComposer().hasCapability(Capability::PRESENT_FENCE_IS_NOT_RELIABLE)) { outSupported->push_back(FrameEvent::DISPLAY_PRESENT); } return NO_ERROR; @@ -3377,7 +3378,7 @@ void SurfaceFlinger::initScheduler(const sp<DisplayDevice>& display) { features |= Feature::kTracePredictedVsync; } if (!base::GetBoolProperty("debug.sf.vsync_reactor_ignore_present_fences"s, false) && - !getHwComposer().hasCapability(hal::Capability::PRESENT_FENCE_IS_NOT_RELIABLE)) { + !getHwComposer().hasCapability(Capability::PRESENT_FENCE_IS_NOT_RELIABLE)) { features |= Feature::kPresentFences; } |