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

Commit 14226716 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated BufferQueue constructor"

parents 74d8acd7 6d5a7bb9

include/gui/SurfaceComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public: 


private:

    mutable sp<CpuConsumer> mCpuConsumer;

    mutable sp<BufferQueue> mBufferQueue;

    mutable sp<IGraphicBufferProducer> mProducer;

    CpuConsumer::LockedBuffer mBuffer;

    bool mHaveBuffer;

libs/gui/SurfaceComposerClient.cpp

+4 −3
Original line number Diff line number Diff line
@@ -646,8 +646,9 @@ ScreenshotClient::~ScreenshotClient() { 


sp<CpuConsumer> ScreenshotClient::getCpuConsumer() const {

    if (mCpuConsumer == NULL) {

        mBufferQueue = new BufferQueue();

        mCpuConsumer = new CpuConsumer(mBufferQueue, 1);

        sp<IGraphicBufferConsumer> consumer;

        BufferQueue::createBufferQueue(&mProducer, &consumer);

        mCpuConsumer = new CpuConsumer(consumer, 1);

        mCpuConsumer->setName(String8("ScreenshotClient"));

    }

    return mCpuConsumer;
@@ -667,7 +668,7 @@ status_t ScreenshotClient::update(const sp<IBinder>& display, 
        mHaveBuffer = false;

    }



    status_t err = s->captureScreen(display, mBufferQueue,

    status_t err = s->captureScreen(display, mProducer,

            reqWidth, reqHeight, minLayerZ, maxLayerZ, useIdentityTransform);



    if (err == NO_ERROR) {