commit 1c1c4edb98ef60144a832ca683a2e2b4045e6d5b
author Chih-Hung Hsieh <chh@google.com> Tue Aug 02 20:34:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 02 20:34:51 2016 +0000
tree bd04203a3411b9a42ccb0287d9b17875b81dac6d
parent ed1c4cf456d1a0014d3bc474db6ca2766c4cdc04
parent 9bf2a320e73a82c420dfb4beaf976e6d5ac4365a

Merge "Fix google-explicit-constructor warnings in system/vold." am: a3bcf26d93
am: 9bf2a320e7

Change-Id: I8e1288bd16b8a1c968d890412b5d1bdf03e9ae7a

EmulatedVolume.h

diff --git a/EmulatedVolume.h b/EmulatedVolume.h
index 09686c1..9b0c049 100644
--- a/EmulatedVolume.h
+++ b/EmulatedVolume.h
@@ -37,7 +37,7 @@
  */
 class EmulatedVolume : public VolumeBase {
 public:
-    EmulatedVolume(const std::string& rawPath);
+    explicit EmulatedVolume(const std::string& rawPath);
     EmulatedVolume(const std::string& rawPath, dev_t device, const std::string& fsUuid);
     virtual ~EmulatedVolume();
 

NetlinkHandler.h

diff --git a/NetlinkHandler.h b/NetlinkHandler.h
index 00a31c8..56eb23c 100644
--- a/NetlinkHandler.h
+++ b/NetlinkHandler.h
@@ -22,7 +22,7 @@
 class NetlinkHandler: public NetlinkListener {
 
 public:
-    NetlinkHandler(int listenerSocket);
+    explicit NetlinkHandler(int listenerSocket);
     virtual ~NetlinkHandler();
 
     int start(void);

TrimTask.h

diff --git a/TrimTask.h b/TrimTask.h
index 57be802..2ade7b5 100644
--- a/TrimTask.h
+++ b/TrimTask.h
@@ -27,7 +27,7 @@
 
 class TrimTask {
 public:
-    TrimTask(int flags);
+    explicit TrimTask(int flags);
     virtual ~TrimTask();
 
     enum Flags {

VoldCommand.h

diff --git a/VoldCommand.h b/VoldCommand.h
index 5ddc666..e435159 100644
--- a/VoldCommand.h
+++ b/VoldCommand.h
@@ -21,7 +21,7 @@
 
 class VoldCommand : public FrameworkCommand {
 public:
-    VoldCommand(const char *cmd);
+    explicit VoldCommand(const char *cmd);
     virtual ~VoldCommand() {}
 };