Merge commit '3a75c70a' into manual_merge_3a75c70a0

            uint32_t consumerUsage, int bufferCount = DEFAULT_MAX_BUFFERS,

            bool controlledByApp = false);

    virtual ~BufferItemConsumer();

    ~BufferItemConsumer() override;

    // set the name of the BufferItemConsumer that will be used to identify it in

    // log messages.

    class ProxyConsumerListener : public BnConsumerListener {

    public:

        explicit ProxyConsumerListener(const wp<ConsumerListener>& consumerListener);

        virtual ~ProxyConsumerListener();

        ~ProxyConsumerListener() const;

        void onDisconnect() override;

        void onFrameAvailable(const BufferItem& item) override;

        void onFrameReplaced(const BufferItem& item) override;

public:

    BufferQueueConsumer(const sp<BufferQueueCore>& core);

    virtual ~BufferQueueConsumer();

    ~BufferQueueConsumer() override;

    // acquireBuffer attempts to acquire ownership of the next pending buffer in

    // the BufferQueue. If no buffer is pending then it returns

    friend class BufferQueue; // Needed to access binderDied

    BufferQueueProducer(const sp<BufferQueueCore>& core, bool consumerIsSurfaceFlinger = false);

    virtual ~BufferQueueProducer();

    ~BufferQueueProducer() const;

    // requestBuffer returns the GraphicBuffer for slot N.

    //

        virtual void onFrameReplaced(const BufferItem& /* item */) {}

    };

    virtual ~ConsumerBase();

    ~ConsumerBase() override;

    // abandon frees all the buffers and puts the ConsumerBase into the

    // 'abandoned' state.  Once put in this state the ConsumerBase can never