Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 268f495f authored by Liz Prucka's avatar Liz Prucka Committed by Gerrit Code Review
Browse files

Merge "FTL: Silence warnings for FTL_FAKE_GUARD" into main

parents 95caae2f 6ab6ccbc

include/ftl/fake_guard.h

+2 −6
Original line number Diff line number Diff line
@@ -76,12 +76,8 @@ struct [[clang::scoped_lockable]] FakeGuard final { 
  FTL_ATTRIBUTE(release_capability(mutex))

#endif



// The parentheses around `expr` are needed to deduce an lvalue or rvalue reference.

#define FTL_FAKE_GUARD2(mutex, expr) \

  [&]() -> decltype(auto) {                     \

    const android::ftl::FakeGuard guard(mutex); \

    return (expr);                              \

  }()

    (android::ftl::FakeGuard(mutex), expr)



#define FTL_MAKE_FAKE_GUARD(arg1, arg2, guard, ...) guard

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -6675,7 +6675,7 @@ void SurfaceFlinger::dumpOffscreenLayers(std::string& result) { 
}



void SurfaceFlinger::dumpHwcLayersMinidumpLockedLegacy(std::string& result) const {

    for (const auto& [token, display] : FTL_FAKE_GUARD(mStateLock, mDisplays)) {

    for (const auto& [token, display] : mDisplays) {

        const auto displayId = HalDisplayId::tryCast(display->getId());

        if (!displayId) {

            continue;
@@ -6695,7 +6695,7 @@ void SurfaceFlinger::dumpHwcLayersMinidump(std::string& result) const { 
    if (!mLayerLifecycleManagerEnabled) {

        return dumpHwcLayersMinidumpLockedLegacy(result);

    }

    for (const auto& [token, display] : FTL_FAKE_GUARD(mStateLock, mDisplays)) {

    for (const auto& [token, display] : mDisplays) {

        const auto displayId = HalDisplayId::tryCast(display->getId());

        if (!displayId) {

            continue;