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

Commit 14386800 authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge "SF: Fix -Wunused-but-set-variable"

parents a4cce653 b4ba8f5c

services/surfaceflinger/BufferLayerConsumer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ void BufferLayerConsumer::onDisconnect() { 
}



void BufferLayerConsumer::onSidebandStreamChanged() {

    FrameAvailableListener* unsafeFrameAvailableListener = nullptr;

    [[maybe_unused]] FrameAvailableListener* unsafeFrameAvailableListener = nullptr;

    {

        Mutex::Autolock lock(mFrameAvailableMutex);

        unsafeFrameAvailableListener = mFrameAvailableListener.unsafe_get();

services/surfaceflinger/Layer.cpp

+0 −14
Original line number Diff line number Diff line
@@ -426,20 +426,6 @@ void Layer::prepareBasicGeometryCompositionState() { 


void Layer::prepareGeometryCompositionState() {

    const auto& drawingState{getDrawingState()};



    int type = drawingState.metadata.getInt32(METADATA_WINDOW_TYPE, 0);

    int appId = drawingState.metadata.getInt32(METADATA_OWNER_UID, 0);

    sp<Layer> parent = mDrawingParent.promote();

    if (parent.get()) {

        auto& parentState = parent->getDrawingState();

        const int parentType = parentState.metadata.getInt32(METADATA_WINDOW_TYPE, 0);

        const int parentAppId = parentState.metadata.getInt32(METADATA_OWNER_UID, 0);

        if (parentType > 0 && parentAppId > 0) {

            type = parentType;

            appId = parentAppId;

        }

    }



    auto* compositionState = editCompositionState();



    compositionState->geomBufferSize = getBufferSize(drawingState);

services/surfaceflinger/TimeStats/TimeStats.cpp

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ bool TimeStats::canAddNewAggregatedStats(uid_t uid, const std::string& layerName 
        layerRecords += record.second.stats.size();

    }



    return mTimeStats.stats.size() < MAX_NUM_LAYER_STATS;

    return layerRecords < MAX_NUM_LAYER_STATS;

}



void TimeStats::setPostTime(int32_t layerId, uint64_t frameNumber, const std::string& layerName,