commit d9dd2418f8a4e167e26897a29a9c7560ba3a187c
author Patrick Williams <pdwilliams@google.com> Tue Sep 06 15:31:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 06 15:31:58 2022 +0000
tree 2464f1509e0cd03b8b223767db2ce90e5504b096
parent 877689ff522ebab4945781dc90b276d75940c30c
parent 22e33d68fd9445f6f36c3c65b362e8285eec13b6

Merge "SF: Remove unnecessary mSidebandStream check"

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index b692720..108047e 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -806,7 +806,7 @@
 void Layer::prepareBufferStateClientComposition(
         compositionengine::LayerFE::LayerSettings& layerSettings,
         compositionengine::LayerFE::ClientCompositionTargetSettings& targetSettings) const {
-    if (CC_UNLIKELY(mBufferInfo.mBuffer == 0) && mSidebandStream != nullptr) {
+    if (CC_UNLIKELY(!mBufferInfo.mBuffer)) {
         // For surfaceview of tv sideband, there is no activeBuffer
         // in bufferqueue, we need return LayerSettings.
         return;