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

Commit a5a942a0 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Fix nullptr dereference when reporting hung transaction" into udc-qpr-dev

parents 89270bc7 38d920ef

services/surfaceflinger/SurfaceFlinger.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -4557,6 +4557,9 @@ status_t SurfaceFlinger::setTransactionState( 
            resolvedState.externalTexture =

            resolvedState.externalTexture =

                    getExternalTextureFromBufferData(*resolvedState.state.bufferData,

                    getExternalTextureFromBufferData(*resolvedState.state.bufferData,

                                                     layerName.c_str(), transactionId);

                                                     layerName.c_str(), transactionId);

            if (resolvedState.externalTexture) {

                resolvedState.state.bufferData->buffer = resolvedState.externalTexture->getBuffer();

            }

            mBufferCountTracker.increment(resolvedState.state.surface->localBinder());

            mBufferCountTracker.increment(resolvedState.state.surface->localBinder());

        }

        }

        resolvedState.layerId = LayerHandle::getLayerId(resolvedState.state.surface);

        resolvedState.layerId = LayerHandle::getLayerId(resolvedState.state.surface);