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

Commit 6c1cf453 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Remove promoting weak pointer off main thread." into rvc-dev am: 9f7d285a am: 04b0d677 

Change-Id: I8766a975d4fbe6dd7779693618cadaefadd1b96e
parents 91de0434 04b0d677

services/surfaceflinger/BufferLayerConsumer.cpp

+2 −8
Original line number Diff line number Diff line
@@ -443,10 +443,7 @@ void BufferLayerConsumer::freeBufferLocked(int slotIndex) { 
}



void BufferLayerConsumer::onDisconnect() {

    sp<Layer> l = mLayer.promote();

    if (l.get()) {

        l->onDisconnect();

    }

    mLayer->onDisconnect();

}



void BufferLayerConsumer::onSidebandStreamChanged() {
@@ -480,10 +477,7 @@ void BufferLayerConsumer::onBufferAvailable(const BufferItem& item) { 


void BufferLayerConsumer::addAndGetFrameTimestamps(const NewFrameEventsEntry* newTimestamps,

                                                   FrameEventHistoryDelta* outDelta) {

    sp<Layer> l = mLayer.promote();

    if (l.get()) {

        l->addAndGetFrameTimestamps(newTimestamps, outDelta);

    }

    mLayer->addAndGetFrameTimestamps(newTimestamps, outDelta);

}



void BufferLayerConsumer::abandonLocked() {

services/surfaceflinger/BufferLayerConsumer.h

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ private: 
    const uint32_t mTexName;



    // The layer for this BufferLayerConsumer

    const wp<Layer> mLayer;

    Layer* mLayer;



    wp<ContentsChangedListener> mContentsChangedListener;