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

Commit a8dcc3e8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/13533983

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8202a62005e13fbc17e9f1b0157e9a2b20ae1cb1
parents 82aaaa69 6b52d827

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());