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

Commit 141aab9c authored by Nolan Scobie's avatar Nolan Scobie Committed by Android (Google) Code Review
Browse files

Merge "Fix `deprecated-this-capture` warnings in SF" into main

parents bcfa2141 0074cd66

services/surfaceflinger/SurfaceFlinger.cpp

+20 −20
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ void SurfaceFlinger::bootFinished() { 


    sp<IBinder> input(defaultServiceManager()->waitForService(String16("inputflinger")));



    static_cast<void>(mScheduler->schedule([=]() FTL_FAKE_GUARD(kMainThreadContext) {

    static_cast<void>(mScheduler->schedule([=, this]() FTL_FAKE_GUARD(kMainThreadContext) {

        if (input == nullptr) {

            ALOGE("Failed to link to input service");

        } else {
@@ -1292,7 +1292,7 @@ status_t SurfaceFlinger::setActiveModeFromBackdoor(const sp<display::DisplayToke 
    }



    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(kMainThreadContext) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(kMainThreadContext) -> status_t {

        const auto displayOpt =

                FTL_FAKE_GUARD(mStateLock,

                               ftl::find_if(mPhysicalDisplays,
@@ -1479,7 +1479,7 @@ void SurfaceFlinger::initiateDisplayModeChanges() { 


void SurfaceFlinger::disableExpensiveRendering() {

    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) {

        ATRACE_NAME(whence);

        if (mPowerAdvisor->isUsingExpensiveRendering()) {

            for (const auto& [_, display] : mDisplays) {
@@ -1521,7 +1521,7 @@ status_t SurfaceFlinger::setActiveColorMode(const sp<IBinder>& displayToken, ui: 
    }



    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) -> status_t {

        const auto displayOpt =

                ftl::find_if(mPhysicalDisplays, PhysicalDisplay::hasToken(displayToken))

                        .transform(&ftl::to_mapped_ref<PhysicalDisplays>)
@@ -1602,7 +1602,7 @@ status_t SurfaceFlinger::getOverlaySupport(gui::OverlayProperties* outProperties 
status_t SurfaceFlinger::setBootDisplayMode(const sp<display::DisplayToken>& displayToken,

                                            DisplayModeId modeId) {

    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) -> status_t {

        const auto snapshotOpt =

                ftl::find_if(mPhysicalDisplays, PhysicalDisplay::hasToken(displayToken))

                        .transform(&ftl::to_mapped_ref<PhysicalDisplays>)
@@ -1630,7 +1630,7 @@ status_t SurfaceFlinger::setBootDisplayMode(const sp<display::DisplayToken>& dis 


status_t SurfaceFlinger::clearBootDisplayMode(const sp<IBinder>& displayToken) {

    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) -> status_t {

        if (const auto displayId = getPhysicalDisplayIdLocked(displayToken)) {

            return getHwComposer().clearBootDisplayMode(*displayId);

        } else {
@@ -1669,7 +1669,7 @@ status_t SurfaceFlinger::setHdrConversionStrategy( 
        ALOGE("hdrOutputConversion is not supported by this device.");

        return INVALID_OPERATION;

    }

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) mutable -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) mutable -> status_t {

        using AidlHdrConversionStrategy =

                aidl::android::hardware::graphics::common::HdrConversionStrategy;

        using GuiHdrConversionStrategyTag = gui::HdrConversionStrategy::Tag;
@@ -1729,7 +1729,7 @@ status_t SurfaceFlinger::getHdrOutputConversionSupport(bool* outSupport) const { 


void SurfaceFlinger::setAutoLowLatencyMode(const sp<IBinder>& displayToken, bool on) {

    const char* const whence = __func__;

    static_cast<void>(mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) {

    static_cast<void>(mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) {

        if (const auto displayId = getPhysicalDisplayIdLocked(displayToken)) {

            getHwComposer().setAutoLowLatencyMode(*displayId, on);

        } else {
@@ -1740,7 +1740,7 @@ void SurfaceFlinger::setAutoLowLatencyMode(const sp<IBinder>& displayToken, bool 


void SurfaceFlinger::setGameContentType(const sp<IBinder>& displayToken, bool on) {

    const char* const whence = __func__;

    static_cast<void>(mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) {

    static_cast<void>(mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) {

        if (const auto displayId = getPhysicalDisplayIdLocked(displayToken)) {

            const auto type = on ? hal::ContentType::GAME : hal::ContentType::NONE;

            getHwComposer().setContentType(*displayId, type);
@@ -1794,7 +1794,7 @@ status_t SurfaceFlinger::setDisplayContentSamplingEnabled(const sp<IBinder>& dis 
                                                          bool enable, uint8_t componentMask,

                                                          uint64_t maxFrames) {

    const char* const whence = __func__;

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) -> status_t {

        if (const auto displayId = getPhysicalDisplayIdLocked(displayToken)) {

            return getHwComposer().setDisplayContentSamplingEnabled(*displayId, enable,

                                                                    componentMask, maxFrames);
@@ -1847,7 +1847,7 @@ status_t SurfaceFlinger::isWideColorDisplay(const sp<IBinder>& displayToken, 


status_t SurfaceFlinger::getLayerDebugInfo(std::vector<gui::LayerDebugInfo>* outLayers) {

    outLayers->clear();

    auto future = mScheduler->schedule([=] {

    auto future = mScheduler->schedule([=, this] {

        const auto display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked());

        mDrawingState.traverseInZOrder([&](Layer* layer) {

            outLayers->push_back(layer->getLayerDebugInfo(display.get()));
@@ -1953,7 +1953,7 @@ status_t SurfaceFlinger::setDisplayBrightness(const sp<IBinder>& displayToken, 
    }



    const char* const whence = __func__;

    return ftl::Future(mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) {

    return ftl::Future(mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) {

               if (const auto display = getDisplayDeviceLocked(displayToken)) {

                   const bool supportsDisplayBrightnessCommand =

                           getHwComposer().getComposer()->isSupported(
@@ -2208,7 +2208,7 @@ void SurfaceFlinger::onRefreshRateChangedDebug(const RefreshRateChangedDebugData 
    ATRACE_CALL();

    if (const auto displayId = getHwComposer().toPhysicalDisplayId(data.display); displayId) {

        const char* const whence = __func__;

        static_cast<void>(mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) {

        static_cast<void>(mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) {

            const Fps fps = Fps::fromPeriodNsecs(getHwComposer().getComposer()->isVrrSupported()

                                                         ? data.refreshPeriodNanos

                                                         : data.vsyncPeriodNanos);
@@ -4438,7 +4438,7 @@ status_t SurfaceFlinger::addClientLayer(LayerCreationArgs& args, const sp<IBinde 
    if (mNumLayers >= MAX_LAYERS) {

        ALOGE("AddClientLayer failed, mNumLayers (%zu) >= MAX_LAYERS (%zu)", mNumLayers.load(),

              MAX_LAYERS);

        static_cast<void>(mScheduler->schedule([=] {

        static_cast<void>(mScheduler->schedule([=, this] {

            ALOGE("Dumping layer keeping > 20 children alive:");

            bool leakingParentLayerFound = false;

            mDrawingState.traverse([&](Layer* layer) {
@@ -6022,7 +6022,7 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal: 
}



void SurfaceFlinger::setPowerMode(const sp<IBinder>& displayToken, int mode) {

    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(mStateLock) FTL_FAKE_GUARD(

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(mStateLock) FTL_FAKE_GUARD(

                                               kMainThreadContext) {

        const auto display = getDisplayDeviceLocked(displayToken);

        if (!display) {
@@ -6471,7 +6471,7 @@ void SurfaceFlinger::dumpOffscreenLayersProto(perfetto::protos::LayersProto& lay 
}



perfetto::protos::LayersProto SurfaceFlinger::dumpProtoFromMainThread(uint32_t traceFlags) {

    return mScheduler->schedule([=] { return dumpDrawingStateProto(traceFlags); }).get();

    return mScheduler->schedule([=, this] { return dumpDrawingStateProto(traceFlags); }).get();

}



void SurfaceFlinger::dumpOffscreenLayers(std::string& result) {
@@ -7392,7 +7392,7 @@ void SurfaceFlinger::kernelTimerChanged(bool expired) { 


    // Update the overlay on the main thread to avoid race conditions with

    // RefreshRateSelector::getActiveMode

    static_cast<void>(mScheduler->schedule([=] {

    static_cast<void>(mScheduler->schedule([=, this] {

        const auto display = FTL_FAKE_GUARD(mStateLock, getDefaultDisplayDeviceLocked());

        if (!display) {

            ALOGW("%s: default display is null", __func__);
@@ -7833,7 +7833,7 @@ void SurfaceFlinger::captureLayers(const LayerCaptureArgs& args, 
    }



    bool childrenOnly = args.childrenOnly;

    RenderAreaFuture renderAreaFuture = ftl::defer([=]() -> std::unique_ptr<RenderArea> {

    RenderAreaFuture renderAreaFuture = ftl::defer([=, this]() -> std::unique_ptr<RenderArea> {

        ui::Transform layerTransform;

        Rect layerBufferSize;

        if (mLayerLifecycleManagerEnabled) {
@@ -7972,7 +7972,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::captureScreenCommon( 
    ATRACE_CALL();



    auto future = mScheduler->schedule(

            [=, renderAreaFuture = std::move(renderAreaFuture)]() FTL_FAKE_GUARD(

            [=, this, renderAreaFuture = std::move(renderAreaFuture)]() FTL_FAKE_GUARD(

                    kMainThreadContext) mutable -> ftl::SharedFuture<FenceResult> {

                ScreenCaptureResults captureResults;

                std::shared_ptr<RenderArea> renderArea = renderAreaFuture.get();
@@ -8397,7 +8397,7 @@ status_t SurfaceFlinger::setDesiredDisplayModeSpecs(const sp<IBinder>& displayTo 
        return BAD_VALUE;

    }



    auto future = mScheduler->schedule([=]() FTL_FAKE_GUARD(kMainThreadContext) -> status_t {

    auto future = mScheduler->schedule([=, this]() FTL_FAKE_GUARD(kMainThreadContext) -> status_t {

        const auto display = FTL_FAKE_GUARD(mStateLock, getDisplayDeviceLocked(displayToken));

        if (!display) {

            ALOGE("Attempt to set desired display modes for invalid display token %p",