commit cfe8258aba09a7f9532e3d7936f8720096e2b5c4
author Ady Abraham <adyabr@google.com> Tue Feb 09 20:10:58 2021 +0000
committer Ady Abraham <adyabr@google.com> Tue Feb 09 20:56:18 2021 +0000
tree 8c0e94c7d9c655221e0583ffefddc394623d4212
parent b9a7dabfc3f6896986b54cf6b21bf1a483391256

SurfaceFlinger: remove a redundant nullptr check

Fixes: 179804956
Test: SF unit tests
Change-Id: I23530c82b1e9919077531b880e465362ac64379f

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index df14003..87ca9c7 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -867,9 +867,7 @@
 void Layer::popPendingState(State* stateToCommit) {
     ATRACE_CALL();
 
-    if (stateToCommit != nullptr) {
-        mergeSurfaceFrames(*stateToCommit, mPendingStates[0]);
-    }
+    mergeSurfaceFrames(*stateToCommit, mPendingStates[0]);
     *stateToCommit = mPendingStates[0];
     mPendingStates.pop_front();
     ATRACE_INT(mTransactionName.c_str(), mPendingStates.size());