commit d62c7277dc300214bc289005c0402d3fc66c8730
author Chih-Hung Hsieh <chh@google.com> Tue Jul 12 22:20:38 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jul 12 22:20:38 2016 +0000
tree 970f7382960c384acca1172ffd342bc46099cf00
parent b8fdcc2b65c1662ab441afd368a86beee58185ec
parent 590a1dade7d1aaefbd4c66ecd9d1ce81092faeb9

Merge \"Fix google-explicit-constructor warnings in keystore.\"
am: 590a1dade7

Change-Id: Ie0f3f1be4ee7ba9fbe249b951b452642c505895a

keystore/auth_token_table.h

diff --git a/keystore/auth_token_table.h b/keystore/auth_token_table.h
index a2f1446..bcf88fd 100644
--- a/keystore/auth_token_table.h
+++ b/keystore/auth_token_table.h
@@ -41,7 +41,7 @@
  */
 class AuthTokenTable {
   public:
-    AuthTokenTable(size_t max_entries = 32, time_t (*clock_function)() = clock_gettime_raw)
+    explicit AuthTokenTable(size_t max_entries = 32, time_t (*clock_function)() = clock_gettime_raw)
         : max_entries_(max_entries), clock_function_(clock_function) {}
 
     enum Error {

keystore/blob.h

diff --git a/keystore/blob.h b/keystore/blob.h
index 584e312..3fa71ef 100644
--- a/keystore/blob.h
+++ b/keystore/blob.h
@@ -78,7 +78,7 @@
   public:
     Blob(const uint8_t* value, size_t valueLength, const uint8_t* info, uint8_t infoLength,
          BlobType type);
-    Blob(blob b);
+    explicit Blob(blob b);
 
     Blob();
 

keystore/key_store_service.h

diff --git a/keystore/key_store_service.h b/keystore/key_store_service.h
index 7d55919..64cbdd2 100644
--- a/keystore/key_store_service.h
+++ b/keystore/key_store_service.h
@@ -31,7 +31,7 @@
 
 class KeyStoreService : public BnKeystoreService, public IBinder::DeathRecipient {
   public:
-    KeyStoreService(KeyStore* keyStore) : mKeyStore(keyStore), mOperationMap(this) {}
+    explicit KeyStoreService(KeyStore* keyStore) : mKeyStore(keyStore), mOperationMap(this) {}
 
     void binderDied(const wp<IBinder>& who);
 

keystore/operation.h

diff --git a/keystore/operation.h b/keystore/operation.h
index eb16257..083ec29 100644
--- a/keystore/operation.h
+++ b/keystore/operation.h
@@ -46,7 +46,7 @@
  */
 class OperationMap {
 public:
-    OperationMap(IBinder::DeathRecipient* deathRecipient);
+    explicit OperationMap(IBinder::DeathRecipient* deathRecipient);
     sp<IBinder> addOperation(keymaster_operation_handle_t handle, uint64_t keyid,
                              keymaster_purpose_t purpose, const keymaster2_device_t* dev,
                              sp<IBinder> appToken, keymaster_key_characteristics_t* characteristics,

keystore/user_state.h

diff --git a/keystore/user_state.h b/keystore/user_state.h
index 2a52f81..902719c 100644
--- a/keystore/user_state.h
+++ b/keystore/user_state.h
@@ -29,7 +29,7 @@
 
 class UserState {
   public:
-    UserState(uid_t userId);
+    explicit UserState(uid_t userId);
     ~UserState();
 
     bool initialize();