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

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

Merge "Fix google-explicit-constructor warnings in binder." 

am: 8b2d3da4

Change-Id: I3293141f444e547957df9579fe6d258df696bbe7
parents 55ef158c 8b2d3da4

include/binder/Binder.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ private: 
class BpRefBase : public virtual RefBase

class BpRefBase : public virtual RefBase

{

{

protected:

protected:

                            BpRefBase(const sp<IBinder>& o);

    explicit                BpRefBase(const sp<IBinder>& o);

    virtual                 ~BpRefBase();

    virtual                 ~BpRefBase();

    virtual void            onFirstRef();

    virtual void            onFirstRef();

    virtual void            onLastStrongRef(const void* id);

    virtual void            onLastStrongRef(const void* id);

include/binder/IInterface.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ template<typename INTERFACE> 
class BpInterface : public INTERFACE, public BpRefBase

class BpInterface : public INTERFACE, public BpRefBase

{

{

public:

public:

                                BpInterface(const sp<IBinder>& remote);

    explicit                    BpInterface(const sp<IBinder>& remote);





protected:

protected:

    virtual IBinder*            onAsBinder();

    virtual IBinder*            onAsBinder();