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

Commit 11a2bcad authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix weak vtable warnings" 

am: d93a40c9

Change-Id: I54d2cad55131ac3a8786012d692d4627f188a0a7
parents 3f6292ea d93a40c9

include/binder/IBinder.h

+12 −0
Original line number Diff line number Diff line
@@ -90,12 +90,24 @@ public: 
                                        Parcel* reply,

                                        uint32_t flags = 0) = 0;



    // DeathRecipient is pure abstract, there is no virtual method

    // implementation to put in a translation unit in order to silence the

    // weak vtables warning.

    #if defined(__clang__)

    #pragma clang diagnostic push

    #pragma clang diagnostic ignored "-Wweak-vtables"

    #endif



    class DeathRecipient : public virtual RefBase

    {

    public:

        virtual void binderDied(const wp<IBinder>& who) = 0;

    };



    #if defined(__clang__)

    #pragma clang diagnostic pop

    #endif



    /**

     * Register the @a recipient for a notification if this binder

     * goes away.  If this binder object unexpectedly goes away

include/binder/Parcel.h

+11 −0
Original line number Diff line number Diff line
@@ -463,6 +463,11 @@ private: 
        bool mMutable;

    };



    #if defined(__clang__)

    #pragma clang diagnostic push

    #pragma clang diagnostic ignored "-Wweak-vtables"

    #endif



    class FlattenableHelperInterface {

    protected:

        ~FlattenableHelperInterface() { }
@@ -473,12 +478,18 @@ private: 
        virtual status_t unflatten(void const* buffer, size_t size, int const* fds, size_t count) = 0;

    };



    #if defined(__clang__)

    #pragma clang diagnostic pop

    #endif



    template<typename T>

    class FlattenableHelper : public FlattenableHelperInterface {

        friend class Parcel;

        const Flattenable<T>& val;

        explicit FlattenableHelper(const Flattenable<T>& _val) : val(_val) { }



    protected:

        ~FlattenableHelper() = default;

    public:

        virtual size_t getFlattenedSize() const {

            return val.getFlattenedSize();

include/binder/Parcelable.h

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ namespace android { 


class Parcel;



#if defined(__clang__)

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wweak-vtables"

#endif



// Abstract interface of all parcelables.

class Parcelable {

public:
@@ -46,6 +51,10 @@ public: 
    virtual status_t readFromParcel(const Parcel* parcel) = 0;

};  // class Parcelable



#if defined(__clang__)

#pragma clang diagnostic pop

#endif



}  // namespace android



#endif // ANDROID_PARCELABLE_H

include/gui/IConsumerListener.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class BufferItem; 
class ConsumerListener : public virtual RefBase {

public:

    ConsumerListener() { }

    virtual ~ConsumerListener() { }

    virtual ~ConsumerListener();



    // onFrameAvailable is called from queueBuffer each time an additional

    // frame becomes available for consumption. This means that frames that

include/gui/IProducerListener.h

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class ProducerListener : public virtual RefBase 
{

public:

    ProducerListener() {}

    virtual ~ProducerListener() {}

    virtual ~ProducerListener();



    // onBufferReleased is called from IGraphicBufferConsumer::releaseBuffer to

    // notify the producer that a new buffer is free and ready to be dequeued.
@@ -59,6 +59,7 @@ public: 
class DummyProducerListener : public BnProducerListener

{

public:

    virtual ~DummyProducerListener();

    virtual void onBufferReleased() {}

};