commit 6c0452358c4db14494127ecef0a3a30c54b9c0f1
author Chih-Hung Hsieh <chh@google.com> Wed Jul 13 08:57:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 13 08:57:46 2016 +0000
tree 24519a6715cc0440e9576c3acbe555022cfb8962
parent 8a68c45e378d58b6701cfe9a8b32c3d566870bad
parent 2983efd14d731d86f110cff4048f8087fd3ab8aa

Fix google-explicit-constructor warnings in system/tpm. am: 37d87ae585 am: ce78b10a63 am: 2381084268
am: 2983efd14d

Change-Id: I73399e1c338064d68f80fc6f951a2977a3fd8c6e

tpm_manager/server/binder_service.h

diff --git a/tpm_manager/server/binder_service.h b/tpm_manager/server/binder_service.h
index c4de0c6..bda64ef 100644
--- a/tpm_manager/server/binder_service.h
+++ b/tpm_manager/server/binder_service.h
@@ -55,7 +55,7 @@
   friend class NvramServiceInternal;
   class NvramServiceInternal : public android::tpm_manager::BnTpmNvram {
    public:
-    NvramServiceInternal(TpmNvramInterface* service);
+    explicit NvramServiceInternal(TpmNvramInterface* service);
     ~NvramServiceInternal() override = default;
 
     // ITpmNvram interface.
@@ -95,7 +95,7 @@
   friend class OwnershipServiceInternal;
   class OwnershipServiceInternal : public android::tpm_manager::BnTpmOwnership {
    public:
-    OwnershipServiceInternal(TpmOwnershipInterface* service);
+    explicit OwnershipServiceInternal(TpmOwnershipInterface* service);
     ~OwnershipServiceInternal() override = default;
 
     // ITpmOwnership interface.

trunks/trunks_binder_service.h

diff --git a/trunks/trunks_binder_service.h b/trunks/trunks_binder_service.h
index d9c8dec..d26730f 100644
--- a/trunks/trunks_binder_service.h
+++ b/trunks/trunks_binder_service.h
@@ -52,7 +52,7 @@
   friend class BinderServiceInternal;
   class BinderServiceInternal : public android::trunks::BnTrunks {
    public:
-    BinderServiceInternal(TrunksBinderService* service);
+    explicit BinderServiceInternal(TrunksBinderService* service);
     ~BinderServiceInternal() override = default;
 
     // ITrunks interface.

trunks/trunks_client_test.cc

diff --git a/trunks/trunks_client_test.cc b/trunks/trunks_client_test.cc
index eb60b19..74b4305 100644
--- a/trunks/trunks_client_test.cc
+++ b/trunks/trunks_client_test.cc
@@ -841,7 +841,7 @@
   };
   class Scoper {
    public:
-    Scoper(const base::Closure& callback) : callback_(callback) {}
+    explicit Scoper(const base::Closure& callback) : callback_(callback) {}
     ~Scoper() {
       if (!cancel_)
         callback_.Run();