commit 6b52d827b7b8f3be948426c23fb24d3228d2b834
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 10 02:44:11 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 02:44:11 2021 +0000
tree 70e1a2b4a707c04a9bd66681b6ada990a5468be3
parent 030bc495f227e61b45b976c7e653da23098f1202
parent cfe8258aba09a7f9532e3d7936f8720096e2b5c4

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

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