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

Commit f73db7a6 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Harden construction sites of android::StrongPointer." 

This reverts commit 81793808.

Reason for revert: Droidmonitor created revert due to b/397788382. Will be verifying through ABTD before submission.

Change-Id: Idd58b82a5a5380053cdff4e7b92eafa66b2c2782
parent 81793808

libs/gui/BLASTBufferQueue.cpp

+11 −13
Original line number Diff line number Diff line
@@ -197,12 +197,12 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati 
        mUpdateDestinationFrame(updateDestinationFrame) {

    createBufferQueue(&mProducer, &mConsumer);

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    mBufferItemConsumer = sp<BLASTBufferItemConsumer>::make(mProducer, mConsumer,

    mBufferItemConsumer = new BLASTBufferItemConsumer(mProducer, mConsumer,

                                                      GraphicBuffer::USAGE_HW_COMPOSER |

                                                              GraphicBuffer::USAGE_HW_TEXTURE,

                                                      1, false, this);

#else

    mBufferItemConsumer = sp<BLASTBufferItemConsumer>::make(mConsumer,

    mBufferItemConsumer = new BLASTBufferItemConsumer(mConsumer,

                                                      GraphicBuffer::USAGE_HW_COMPOSER |

                                                              GraphicBuffer::USAGE_HW_TEXTURE,

                                                      1, false, this);
@@ -641,8 +641,7 @@ status_t BLASTBufferQueue::acquireNextBufferLocked( 
                           bufferItem.mScalingMode, crop);



    auto releaseBufferCallback = makeReleaseBufferCallbackThunk();

    sp<Fence> fence =

            bufferItem.mFence ? sp<Fence>::make(bufferItem.mFence->dup()) : Fence::NO_FENCE;

    sp<Fence> fence = bufferItem.mFence ? new Fence(bufferItem.mFence->dup()) : Fence::NO_FENCE;



    nsecs_t dequeueTime = -1;

    {
@@ -1019,8 +1018,7 @@ sp<Surface> BLASTBufferQueue::getSurface(bool includeSurfaceControlHandle) { 
    if (includeSurfaceControlHandle && mSurfaceControl) {

        scHandle = mSurfaceControl->getHandle();

    }

    return sp<BBQSurface>::make(mProducer, true, scHandle,

                                sp<BLASTBufferQueue>::fromExisting(this));

    return new BBQSurface(mProducer, true, scHandle, this);

}



void BLASTBufferQueue::mergeWithNextTransaction(SurfaceComposerClient::Transaction* t,
@@ -1183,7 +1181,7 @@ public: 
            return BufferQueueProducer::connect(listener, api, producerControlledByApp, output);

        }



        return BufferQueueProducer::connect(sp<AsyncProducerListener>::make(listener), api,

        return BufferQueueProducer::connect(new AsyncProducerListener(listener), api,

                                            producerControlledByApp, output);

    }

libs/gui/BufferItem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -215,14 +215,14 @@ status_t BufferItem::unflatten( 
    FlattenableUtils::read(buffer, size, flags);



    if (flags & 1) {

        mGraphicBuffer = sp<GraphicBuffer>::make();

        mGraphicBuffer = new GraphicBuffer();

        status_t err = mGraphicBuffer->unflatten(buffer, size, fds, count);

        if (err) return err;

        size -= FlattenableUtils::align<4>(buffer);

    }



    if (flags & 2) {

        mFence = sp<Fence>::make();

        mFence = new Fence();

        status_t err = mFence->unflatten(buffer, size, fds, count);

        if (err) return err;

        size -= FlattenableUtils::align<4>(buffer);

libs/gui/BufferQueue.cpp

+3 −4
Original line number Diff line number Diff line
@@ -125,16 +125,15 @@ void BufferQueue::createBufferQueue(sp<IGraphicBufferProducer>* outProducer, 
    LOG_ALWAYS_FATAL_IF(outConsumer == nullptr,

            "BufferQueue: outConsumer must not be NULL");



    sp<BufferQueueCore> core = sp<BufferQueueCore>::make();

    sp<BufferQueueCore> core(new BufferQueueCore());

    LOG_ALWAYS_FATAL_IF(core == nullptr,

            "BufferQueue: failed to create BufferQueueCore");



    sp<IGraphicBufferProducer> producer =

            sp<BufferQueueProducer>::make(core, consumerIsSurfaceFlinger);

    sp<IGraphicBufferProducer> producer(new BufferQueueProducer(core, consumerIsSurfaceFlinger));

    LOG_ALWAYS_FATAL_IF(producer == nullptr,

            "BufferQueue: failed to create BufferQueueProducer");



    sp<IGraphicBufferConsumer> consumer = sp<BufferQueueConsumer>::make(core);

    sp<IGraphicBufferConsumer> consumer(new BufferQueueConsumer(core));

    LOG_ALWAYS_FATAL_IF(consumer == nullptr,

            "BufferQueue: failed to create BufferQueueConsumer");

libs/gui/BufferQueueProducer.cpp

+10 −9
Original line number Diff line number Diff line
@@ -693,11 +693,11 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
                .requestorName = {mConsumerName.c_str(), mConsumerName.size()},

                .extras = std::move(tempOptions),

        };

        sp<GraphicBuffer> graphicBuffer = sp<GraphicBuffer>::make(allocRequest);

        sp<GraphicBuffer> graphicBuffer = new GraphicBuffer(allocRequest);

#else

        sp<GraphicBuffer> graphicBuffer =

                sp<GraphicBuffer>::make(width, height, format, BQ_LAYER_COUNT, usage,

                                        std::string{mConsumerName.c_str(), mConsumerName.size()});

                new GraphicBuffer(width, height, format, BQ_LAYER_COUNT, usage,

                                  {mConsumerName.c_str(), mConsumerName.size()});

#endif



        status_t error = graphicBuffer->initCheck();
@@ -1464,7 +1464,7 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener, 
#ifndef NO_BINDER

                if (IInterface::asBinder(listener)->remoteBinder() != nullptr) {

                    status = IInterface::asBinder(listener)->linkToDeath(

                            sp<IBinder::DeathRecipient>::fromExisting(this));

                            static_cast<IBinder::DeathRecipient*>(this));

                    if (status != NO_ERROR) {

                        BQ_LOGE("connect: linkToDeath failed: %s (%d)",

                                strerror(-status), status);
@@ -1553,7 +1553,8 @@ status_t BufferQueueProducer::disconnect(int api, DisconnectMode mode) { 
                                IInterface::asBinder(mCore->mLinkedToDeath);

                        // This can fail if we're here because of the death

                        // notification, but we just ignore it

                        token->unlinkToDeath(sp<IBinder::DeathRecipient>::fromExisting(this));

                        token->unlinkToDeath(

                                static_cast<IBinder::DeathRecipient*>(this));

                    }

#endif

                    mCore->mSharedBufferSlot =
@@ -1684,10 +1685,10 @@ void BufferQueueProducer::allocateBuffers(uint32_t width, uint32_t height, 
#endif



#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BQ_EXTENDEDALLOCATE)

        sp<GraphicBuffer> graphicBuffer = sp<GraphicBuffer>::make(allocRequest);

        sp<GraphicBuffer> graphicBuffer = new GraphicBuffer(allocRequest);

#else

        sp<GraphicBuffer> graphicBuffer =

                sp<GraphicBuffer>::make(allocWidth, allocHeight, allocFormat, BQ_LAYER_COUNT,

        sp<GraphicBuffer> graphicBuffer = new GraphicBuffer(

                allocWidth, allocHeight, allocFormat, BQ_LAYER_COUNT,

                allocUsage, allocName);

#endif

libs/gui/BufferReleaseChannel.cpp

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ status_t BufferReleaseChannel::Message::flatten(void*& buffer, size_t& size, int 


status_t BufferReleaseChannel::Message::unflatten(void const*& buffer, size_t& size,

                                                  int const*& fds, size_t& count) {

    releaseFence = sp<Fence>::make();

    releaseFence = new Fence();

    if (status_t err = releaseFence->unflatten(buffer, size, fds, count); err != OK) {

        return err;

    }