Merge "Have generateKey() treat additional entropy as optional"

This commit is contained in:
TreeHugger Robot
2017-02-14 13:00:59 +00:00
committed by Android (Google) Code Review

View File

@@ -375,6 +375,7 @@ Return<void> KeymasterDevice::getHardwareFeatures(getHardwareFeatures_cb _hidl_c
}
Return<ErrorCode> KeymasterDevice::addRngEntropy(const hidl_vec<uint8_t>& data) {
if (!data.size()) return ErrorCode::OK;
return legacy_enum_conversion(
keymaster_device_->add_rng_entropy(keymaster_device_, &data[0], data.size()));
}