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

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

Merge "Disable Clang thread-safety checks in surfaceflinger unit tests" into main

parents 1050b6ce ac05bcc6

services/surfaceflinger/tests/unittests/TestableScheduler.h

+3 −1
Original line number Diff line number Diff line
@@ -133,7 +133,9 @@ public: 
    using Scheduler::resyncAllToHardwareVsync;



    auto& mutableLayerHistory() { return mLayerHistory; }

    auto& mutableAttachedChoreographers() { return mAttachedChoreographers; }

    auto& mutableAttachedChoreographers() NO_THREAD_SAFETY_ANALYSIS {

        return mAttachedChoreographers;

    }



    size_t layerHistorySize() NO_THREAD_SAFETY_ANALYSIS {

        return mLayerHistory.mActiveLayerInfos.size() + mLayerHistory.mInactiveLayerInfos.size();

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+12 −6
Original line number Diff line number Diff line
@@ -663,8 +663,10 @@ public: 
     * post-conditions.

     */



    const auto& displays() const { return mFlinger->mDisplays; }

    const auto& physicalDisplays() const { return mFlinger->mPhysicalDisplays; }

    const auto& displays() const NO_THREAD_SAFETY_ANALYSIS { return mFlinger->mDisplays; }

    const auto& physicalDisplays() const NO_THREAD_SAFETY_ANALYSIS {

        return mFlinger->mPhysicalDisplays;

    }

    const auto& currentState() const { return mFlinger->mCurrentState; }

    const auto& drawingState() const { return mFlinger->mDrawingState; }

    const auto& transactionFlags() const { return mFlinger->mTransactionFlags; }
@@ -677,13 +679,17 @@ public: 
    auto& mutableDisplayModeController() { return mFlinger->mDisplayModeController; }

    auto& mutableCurrentState() { return mFlinger->mCurrentState; }

    auto& mutableDisplayColorSetting() { return mFlinger->mDisplayColorSetting; }

    auto& mutableDisplays() { return mFlinger->mDisplays; }

    auto& mutablePhysicalDisplays() { return mFlinger->mPhysicalDisplays; }

    auto& mutableDisplays() NO_THREAD_SAFETY_ANALYSIS { return mFlinger->mDisplays; }

    auto& mutablePhysicalDisplays() NO_THREAD_SAFETY_ANALYSIS {

        return mFlinger->mPhysicalDisplays;

    }

    auto& mutableDrawingState() { return mFlinger->mDrawingState; }

    auto& mutableGeometryDirty() { return mFlinger->mGeometryDirty; }

    auto& mutableVisibleRegionsDirty() { return mFlinger->mVisibleRegionsDirty; }

    auto& mutableMainThreadId() { return mFlinger->mMainThreadId; }

    auto& mutablePendingHotplugEvents() { return mFlinger->mPendingHotplugEvents; }

    auto& mutablePendingHotplugEvents() NO_THREAD_SAFETY_ANALYSIS {

        return mFlinger->mPendingHotplugEvents;

    }

    auto& mutableTransactionFlags() { return mFlinger->mTransactionFlags; }

    auto& mutableDebugDisableHWC() { return mFlinger->mDebugDisableHWC; }

    auto& mutableMaxRenderTargetSize() { return mFlinger->mMaxRenderTargetSize; }
@@ -691,7 +697,7 @@ public: 
    auto& mutableHwcDisplayData() { return getHwComposer().mDisplayData; }

    auto& mutableHwcPhysicalDisplayIdMap() { return getHwComposer().mPhysicalDisplayIdMap; }

    auto& mutablePrimaryHwcDisplayId() { return getHwComposer().mPrimaryHwcDisplayId; }

    auto& mutableActiveDisplayId() { return mFlinger->mActiveDisplayId; }

    auto& mutableActiveDisplayId() NO_THREAD_SAFETY_ANALYSIS { return mFlinger->mActiveDisplayId; }

    auto& mutablePreviouslyComposedLayers() { return mFlinger->mPreviouslyComposedLayers; }



    auto& mutableActiveDisplayRotationFlags() {