Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master

Bug: 135460123
Change-Id: I7bddfec8cc2d1cf26b4c351ddfe06c56a6d8aae9
Merged-In: I2fba61edbd92420b6c4df9bea56392d6afe63e89

1 files changed, 2 insertions, 0 deletions

diff --git a/hals/keymaster/KeymasterDevice.cpp b/hals/keymaster/KeymasterDevice.cpp
index 61614e9..c312262 100644
--- a/hals/keymaster/KeymasterDevice.cpp
+++ b/hals/keymaster/KeymasterDevice.cpp
@@ -346,6 +346,7 @@ Return<void> KeymasterDevice::getHmacSharingParameters(
 
     if (ec != ErrorCode::OK) {
         _hidl_cb(ec, HmacSharingParameters());
+        return Void();
     }
 
     const std::string & nonce = response.hmac_sharing_params().nonce();
@@ -717,6 +718,7 @@ Return<void> KeymasterDevice::attestKey(
         ::strftime(not_after_str, sizeof(not_after_str),
                    "%y%m%d%H%M%SZ", gmtime(&not_after)) == 0) {
         _hidl_cb(ErrorCode::UNKNOWN_ERROR, hidl_vec<hidl_vec<uint8_t> >{});
+        return Void();
     }
 
     startRequest.mutable_blob()->set_blob(&keyToAttest[0], keyToAttest.size());