Merge "resolve merge conflicts of d254ce4 to master"
diff --git a/Keymaster.cpp b/Keymaster.cpp
index d271b6a..c43613e 100644
--- a/Keymaster.cpp
+++ b/Keymaster.cpp
@@ -53,7 +53,7 @@
template <typename T> class KeymasterDevice : public IKeymasterDevice {
public:
- KeymasterDevice(T* d) : mDevice{d} {}
+ explicit KeymasterDevice(T* d) : mDevice{d} {}
keymaster_error_t generate_key(const keymaster_key_param_set_t* params,
keymaster_key_blob_t* key_blob) const override final {
return mDevice->generate_key(mDevice, params, key_blob, nullptr);
@@ -86,7 +86,7 @@
class Keymaster1Device : public KeymasterDevice<keymaster1_device_t> {
public:
- Keymaster1Device(keymaster1_device_t* d) : KeymasterDevice<keymaster1_device_t>{d} {}
+ explicit Keymaster1Device(keymaster1_device_t* d) : KeymasterDevice<keymaster1_device_t>{d} {}
~Keymaster1Device() override final { keymaster1_close(mDevice); }
keymaster_error_t finish(keymaster_operation_handle_t operation_handle,
const keymaster_key_param_set_t* in_params,
@@ -99,7 +99,7 @@
class Keymaster2Device : public KeymasterDevice<keymaster2_device_t> {
public:
- Keymaster2Device(keymaster2_device_t* d) : KeymasterDevice<keymaster2_device_t>{d} {}
+ explicit Keymaster2Device(keymaster2_device_t* d) : KeymasterDevice<keymaster2_device_t>{d} {}
~Keymaster2Device() override final { keymaster2_close(mDevice); }
keymaster_error_t finish(keymaster_operation_handle_t operation_handle,
const keymaster_key_param_set_t* in_params,
diff --git a/cryptfs.c b/cryptfs.c
index 258557c..0334bbd 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -1737,11 +1737,11 @@
return -1;
}
- property_set("vold.decrypt", "trigger_load_persist_props");
/* Create necessary paths on /data */
if (prep_data_fs()) {
return -1;
}
+ property_set("vold.decrypt", "trigger_load_persist_props");
/* startup service classes main and late_start */
property_set("vold.decrypt", "trigger_restart_framework");