Merge "Fix Keymaster HAL crash." into oc-dev

am: a22bc7450b

Change-Id: I7c765d18c3a6fc8e9741e45802f2991b07cf6fdf
This commit is contained in:
Shawn Willden 2017-05-03 21:59:29 +00:00 committed by android-build-merger
commit 839ef0db40

View file

@ -549,6 +549,7 @@ Return<void> KeymasterDevice::attestKey(const hidl_vec<uint8_t>& keyToAttest,
if (!foundAttestationApplicationId) {
_hidl_cb(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING,
resultCertChain);
return Void();
}
keymaster_cert_chain_t cert_chain{nullptr, 0};