diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-06 19:30:30 +0000 |
---|---|---|
committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2019-11-06 19:30:30 +0000 |
commit | b91e7621182e2c4c50f4847e5c2337158229bd09 (patch) | |
tree | 993884265ae1cbb80d89e3dffeaf42c3f0e52133 | |
parent | 791f018bfb112c5e59f72fde10d51caa25fb162e (diff) | |
parent | e848dcb1a6957d157e6f01be3354b39a9a6c1161 (diff) | |
download | android-simpleperf-release.tar.gz |
Snap for 5991463 from e848dcb1a6957d157e6f01be3354b39a9a6c1161 to simpleperf-releasesimpleperf-release
Change-Id: I7ece644592decd11fc7b5efff8aa96d46e4d38a4
-rw-r--r-- | hals/keymaster/KeymasterDevice.cpp | 2 |
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(¬_after)) == 0) { _hidl_cb(ErrorCode::UNKNOWN_ERROR, hidl_vec<hidl_vec<uint8_t> >{}); + return Void(); } startRequest.mutable_blob()->set_blob(&keyToAttest[0], keyToAttest.size()); |