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

Commit 197bd57c authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress binder google-explicit-constructor warnings" am: a591cd82 am: fb1be056 

am: 2b2031a6

Change-Id: I78966fdc5f804b49bbf6c0c40e3405f84b9b609b
parents c5df0564 2b2031a6

libs/binder/Value.cpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public: 
template<typename T> class Value::Content : public Value::ContentBase {

public:

    Content() = default;

    Content(const T & value) : mValue(value) { }

    explicit Content(const T & value) : mValue(value) { }



    virtual ~Content() = default;

libs/binder/include/binder/BufferedTextOutput.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public: 
        MULTITHREADED = 0x0001

    };

    

                        BufferedTextOutput(uint32_t flags = 0);

    explicit            BufferedTextOutput(uint32_t flags = 0);

    virtual             ~BufferedTextOutput();

    

    virtual status_t    print(const char* txt, size_t len);

libs/binder/include/binder/IpPrefix.h

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ public: 
private:

    union InternalUnion {

        InternalUnion() = default;

        InternalUnion(const struct in6_addr &addr):mIn6Addr(addr) { };

        InternalUnion(const struct in_addr &addr):mInAddr(addr) { };

        explicit InternalUnion(const struct in6_addr &addr):mIn6Addr(addr) { };

        explicit InternalUnion(const struct in_addr &addr):mInAddr(addr) { };

        struct in6_addr mIn6Addr;

        struct in_addr mInAddr;

    } mUnion;

libs/binder/include/binder/MemoryDealer.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class SimpleBestFitAllocator; 
class MemoryDealer : public RefBase

{

public:

    MemoryDealer(size_t size, const char* name = nullptr,

    explicit MemoryDealer(size_t size, const char* name = nullptr,

            uint32_t flags = 0 /* or bits such as MemoryHeapBase::READ_ONLY */ );



    virtual sp<IMemory> allocate(size_t size);

libs/binder/include/binder/MemoryHeapBase.h

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ public: 
    /*

     * maps memory from the given device

     */

    MemoryHeapBase(const char* device, size_t size = 0, uint32_t flags = 0);

    explicit MemoryHeapBase(const char* device, size_t size = 0, uint32_t flags = 0);



    /*

     * maps memory from ashmem, with the given name for debugging

     */

    MemoryHeapBase(size_t size, uint32_t flags = 0, char const* name = nullptr);

    explicit MemoryHeapBase(size_t size, uint32_t flags = 0, char const* name = nullptr);



    virtual ~MemoryHeapBase();