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

Commit 6b52d827 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: remove a redundant nullptr check" into sc-dev

parents 030bc495 cfe8258a

services/surfaceflinger/Layer.cpp

+1 −3
Original line number Diff line number Diff line
@@ -867,9 +867,7 @@ void Layer::mergeSurfaceFrames(State& source, State& target) { 
void Layer::popPendingState(State* stateToCommit) {

    ATRACE_CALL();



    if (stateToCommit != nullptr) {

    mergeSurfaceFrames(*stateToCommit, mPendingStates[0]);

    }

    *stateToCommit = mPendingStates[0];

    mPendingStates.pop_front();

    ATRACE_INT(mTransactionName.c_str(), mPendingStates.size());