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

Commit 4c8f03b2 authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24625640



Change-Id: Ibed7492d85fa554aad0393b7e1cc44aa7a32eabb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e0566ee a5a942a0

services/surfaceflinger/SurfaceFlinger.cpp

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

                    getExternalTextureFromBufferData(*resolvedState.state.bufferData,

                                                     layerName.c_str(), transactionId);

            if (resolvedState.externalTexture) {

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

            }

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

        }

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