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

Commit b0a82912 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix/suppress libs/gui google-explicit-constructor warnings"

parents 8f3776a7 aaf62167

libs/gui/FrameTimestamps.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ void FrameEvents::dump(String8& outString) const 
namespace {

namespace {





struct FrameNumberEqual {

struct FrameNumberEqual {

    FrameNumberEqual(uint64_t frameNumber) : mFrameNumber(frameNumber) {}

    explicit FrameNumberEqual(uint64_t frameNumber) : mFrameNumber(frameNumber) {}

    bool operator()(const FrameEvents& frame) {

    bool operator()(const FrameEvents& frame) {

        return frame.valid && mFrameNumber == frame.frameNumber;

        return frame.valid && mFrameNumber == frame.frameNumber;

    }

    }

libs/gui/IGraphicBufferProducer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ BpGraphicBufferProducer::~BpGraphicBufferProducer() {} 
class HpGraphicBufferProducer : public HpInterface<

class HpGraphicBufferProducer : public HpInterface<

        BpGraphicBufferProducer, H2BGraphicBufferProducer> {

        BpGraphicBufferProducer, H2BGraphicBufferProducer> {

public:

public:

    HpGraphicBufferProducer(const sp<IBinder>& base) : PBase(base) {}

    explicit HpGraphicBufferProducer(const sp<IBinder>& base) : PBase(base) {}





    status_t requestBuffer(int slot, sp<GraphicBuffer>* buf) override {

    status_t requestBuffer(int slot, sp<GraphicBuffer>* buf) override {

        return mBase->requestBuffer(slot, buf);

        return mBase->requestBuffer(slot, buf);

libs/gui/include/gui/BufferQueueConsumer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ class BufferQueueCore; 
class BufferQueueConsumer : public BnGraphicBufferConsumer {

class BufferQueueConsumer : public BnGraphicBufferConsumer {





public:

public:

    BufferQueueConsumer(const sp<BufferQueueCore>& core);

    explicit BufferQueueConsumer(const sp<BufferQueueCore>& core);

    ~BufferQueueConsumer() override;

    ~BufferQueueConsumer() override;





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

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

libs/gui/include/gui/BufferQueueProducer.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,8 @@ class BufferQueueProducer : public BnGraphicBufferProducer, 
public:

public:

    friend class BufferQueue; // Needed to access binderDied

    friend class BufferQueue; // Needed to access binderDied





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

    explicit BufferQueueProducer(const sp<BufferQueueCore>& core,

                                 bool consumerIsSurfaceFlinger = false);

    ~BufferQueueProducer() override;

    ~BufferQueueProducer() override;





    // requestBuffer returns the GraphicBuffer for slot N.

    // requestBuffer returns the GraphicBuffer for slot N.

libs/gui/include/gui/DisplayEventReceiver.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ public: 
     * or requestNextVsync to receive them.

     * or requestNextVsync to receive them.

     * Other events start being delivered immediately.

     * Other events start being delivered immediately.

     */

     */

    DisplayEventReceiver(

    explicit DisplayEventReceiver(

            ISurfaceComposer::VsyncSource vsyncSource = ISurfaceComposer::eVsyncSourceApp);

            ISurfaceComposer::VsyncSource vsyncSource = ISurfaceComposer::eVsyncSourceApp);





    /*

    /*