commit 7d7bf0f588675ba1c6c463942ad04e9cbfff5bdf
author Chih-hung Hsieh <chh@google.com> Wed Sep 14 20:43:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 14 20:43:04 2016 +0000
tree bcc56405c76f6330752083ef4e9d64a551b6302d
parent d3a4f89cfb081ec94d5f2f777f3572573a9b7c3c
parent fde6e0c2b9f01ec1032bf5d24600d0a755b0cbd0

Merge "Fix google-explicit-constructor warnings in binder." am: 8b2d3da4c4 am: e00f704122 am: 772819113d
am: fde6e0c2b9

Change-Id: Idfcba06c1a548ebc152b5b623c2a1b146e49291f

include/binder/Binder.h

diff --git a/include/binder/Binder.h b/include/binder/Binder.h
index f849fd4..3404881 100644
--- a/include/binder/Binder.h
+++ b/include/binder/Binder.h
@@ -80,7 +80,7 @@
 class BpRefBase : public virtual RefBase
 {
 protected:
-                            BpRefBase(const sp<IBinder>& o);
+    explicit                BpRefBase(const sp<IBinder>& o);
     virtual                 ~BpRefBase();
     virtual void            onFirstRef();
     virtual void            onLastStrongRef(const void* id);

include/binder/IInterface.h

diff --git a/include/binder/IInterface.h b/include/binder/IInterface.h
index 48c8b3b..be72d44 100644
--- a/include/binder/IInterface.h
+++ b/include/binder/IInterface.h
@@ -63,7 +63,7 @@
 class BpInterface : public INTERFACE, public BpRefBase
 {
 public:
-                                BpInterface(const sp<IBinder>& remote);
+    explicit                    BpInterface(const sp<IBinder>& remote);
 
 protected:
     virtual IBinder*            onAsBinder();