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

Commit 9c0a86bf authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Remove obsolete BLASTBufferQueue constructor 

This constructor may apply a transaction using the default
apply token. Calling update after construction allows the caller
to specify the token. Remove the constructor since its redundant
and maybe error prone in cases where the caller needs to specify
a token.

Bug: 386289111
Test: presubmit
Flag: EXEMPT refactor
Change-Id: Id4f196b029a5c07e2b3c299d14b81f9c548d6d6b
parent 06e3c3fa

libs/gui/BLASTBufferQueue.cpp

+0 −6
Original line number Diff line number Diff line
@@ -244,12 +244,6 @@ BLASTBufferQueue::BLASTBufferQueue(const std::string& name, bool updateDestinati 
    BQA_LOGV("BLASTBufferQueue created");

}



BLASTBufferQueue::BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface,

                                   int width, int height, int32_t format)

      : BLASTBufferQueue(name) {

    update(surface, width, height, format);

}



BLASTBufferQueue::~BLASTBufferQueue() {

    TransactionCompletedListener::getInstance()->removeQueueStallListener(this);

    if (mPendingTransactions.empty()) {

libs/gui/SurfaceControl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ sp<Surface> SurfaceControl::generateSurfaceLocked() 
                                 ISurfaceComposerClient::eOpaque);

    mBbqChild = mClient->createSurface(String8::format("[BBQ] %s", mName.c_str()), 0, 0, mFormat,

                                       flags, mHandle, {}, &ignore);

    mBbq = sp<BLASTBufferQueue>::make("[BBQ]" + mName, mBbqChild, mWidth, mHeight, mFormat);

    mBbq = sp<BLASTBufferQueue>::make("[BBQ] " + mName, /* updateDestinationFrame */ true);

    mBbq->update(mBbqChild, mWidth, mHeight, mFormat);



    // This surface is always consumed by SurfaceFlinger, so the

    // producerControlledByApp value doesn't matter; using false.

libs/gui/include/gui/BLASTBufferQueue.h

+0 −2
Original line number Diff line number Diff line
@@ -90,8 +90,6 @@ private: 
class BLASTBufferQueue : public ConsumerBase::FrameAvailableListener {

public:

    BLASTBufferQueue(const std::string& name, bool updateDestinationFrame = true);

    BLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface, int width,

                     int height, int32_t format);



    sp<IGraphicBufferProducer> getIGraphicBufferProducer() const {

        return mProducer;

libs/gui/tests/BLASTBufferQueue_test.cpp

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ class TestBLASTBufferQueue : public BLASTBufferQueue { 
public:

    TestBLASTBufferQueue(const std::string& name, const sp<SurfaceControl>& surface, int width,

                         int height, int32_t format)

          : BLASTBufferQueue(name, surface, width, height, format) {}

          : BLASTBufferQueue(name) {

        update(surface, width, height, format);

    }



    void transactionCallback(nsecs_t latchTime, const sp<Fence>& presentFence,

                             const std::vector<SurfaceControlStats>& stats) override {