| commit | 839ef0db4058c4d8dd37ece22069fcb181453a7e | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed May 03 21:59:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 03 21:59:29 2017 +0000 |
| tree | 5022baa193646860832446af306b0579d51254a6 | |
| parent | 62ce08c3a276529ae37f5dead1f81321d85f3b38 [diff] | |
| parent | a22bc7450b8a114843a27c36c511910bf4472914 [diff] |
Merge "Fix Keymaster HAL crash." into oc-dev am: a22bc7450b Change-Id: I7c765d18c3a6fc8e9741e45802f2991b07cf6fdf
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp index 219f419..fcdd329 100644 --- a/keymaster/3.0/default/KeymasterDevice.cpp +++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -549,6 +549,7 @@ if (!foundAttestationApplicationId) { _hidl_cb(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING, resultCertChain); + return Void(); } keymaster_cert_chain_t cert_chain{nullptr, 0};