commit 13286c3b510661eb5f1ffbdad5e5a6881a1dbb5e
author Treehugger Robot <treehugger-gerrit@google.com> Mon Sep 16 19:22:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 16 19:22:53 2019 +0000
tree ab3f607d76ea4da99b5d51c6d712c68badb233e9
parent c998eaa1dceb888ba8e3926b71fec33a49cecc68
parent d66b6c2f0355573456be65905407da92d79205c7

Merge "SurfaceFlinger: retain the sideband layer information for composition"

services/surfaceflinger/BufferQueueLayer.cpp

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index bd0b55f..c57b955 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -243,8 +243,9 @@
     bool sidebandStreamChanged = true;
     if (mSidebandStreamChanged.compare_exchange_strong(sidebandStreamChanged, false)) {
         // mSidebandStreamChanged was changed to false
+        mSidebandStream = mConsumer->getSidebandStream();
         auto& layerCompositionState = getCompositionLayer()->editState().frontEnd;
-        layerCompositionState.sidebandStream = mConsumer->getSidebandStream();
+        layerCompositionState.sidebandStream = mSidebandStream;
         if (layerCompositionState.sidebandStream != nullptr) {
             setTransactionFlags(eTransactionNeeded);
             mFlinger->setTransactionFlags(eTraversalNeeded);