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

Commit 94ef1fda authored by Steve Pfetsch's avatar Steve Pfetsch Committed by android-build-merger
Browse files

Revert "services: surfaceflinger: ASAN fix" am: 598f6d54 am: d5156b70 am: 12924419 

am: 6d2eb659

Change-Id: I609bac956dff460334942bd348c0eedc53a42123
parents 4871b1b8 6d2eb659

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8
Original line number Diff line number Diff line
@@ -1836,12 +1836,9 @@ void SurfaceFlinger::updateCursorAsync() 


void SurfaceFlinger::commitTransaction()

{

    sp<const DisplayDevice> hw = getDefaultDisplayDevice();



    if (!mLayersPendingRemoval.isEmpty() && hw->isDisplayOn()) {

    if (!mLayersPendingRemoval.isEmpty()) {

        // Notify removed layers now that they can't be drawn from

        for (size_t i = 0; i < mLayersPendingRemoval.size(); i++) {

            mCurrentState.layersSortedByZ.remove(mLayersPendingRemoval[i]);

            recordBufferingStats(mLayersPendingRemoval[i]->getName().string(),

                    mLayersPendingRemoval[i]->getOccupancyHistory(true));

            mLayersPendingRemoval[i]->onRemoved();
@@ -2288,11 +2285,15 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { 
        return NO_ERROR;

    }



    ssize_t index = mCurrentState.layersSortedByZ.remove(layer);

    if (index >= 0) {

        mLayersPendingRemoval.push(layer);

        mLayersRemoved = true;

        setTransactionFlags(eTransactionNeeded);

        return NO_ERROR;

    }

    return status_t(index);

}



uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) {

    return android_atomic_release_load(&mTransactionFlags);