diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-04-01 20:13:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-01 20:13:03 +0000 |
| commit | abda824767bd0abfe677bfa65a8acbfb37c2bb3f (patch) | |
| tree | e866256b1eeb8719f0777c509b79720dfc4cc611 | |
| parent | 6b3028b1f84cdb6d84b62be9b1efc1a8f82f181a (diff) | |
| parent | 4ffa0d7b8ba465e01639aba0db1160ec726043ea (diff) | |
| download | platform_system_hardware_interfaces-abda824767bd0abfe677bfa65a8acbfb37c2bb3f.tar.gz platform_system_hardware_interfaces-abda824767bd0abfe677bfa65a8acbfb37c2bb3f.tar.bz2 platform_system_hardware_interfaces-abda824767bd0abfe677bfa65a8acbfb37c2bb3f.zip | |
Keystore wifi: Fix getBlob not calling hidl callback on success. am: e77847112d am: 4ffa0d7b8b
Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1661930
Change-Id: I4131f2142228c720de88958e59d0a8eed2b98699
| -rw-r--r-- | wifi/keystore/1.0/default/keystore.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wifi/keystore/1.0/default/keystore.cpp b/wifi/keystore/1.0/default/keystore.cpp index c5c735d2..5640b630 100644 --- a/wifi/keystore/1.0/default/keystore.cpp +++ b/wifi/keystore/1.0/default/keystore.cpp @@ -306,10 +306,8 @@ namespace implementation { // Methods from ::android::hardware::wifi::keystore::V1_0::IKeystore follow. Return<void> Keystore::getBlob(const hidl_string& key, getBlob_cb _hidl_cb) { - ::std::vector<uint8_t> value; - if (auto ks2_cert = keyStore2GetCert(key)) { - value = std::move(*ks2_cert); + _hidl_cb(KeystoreStatusCode::SUCCESS, std::move(*ks2_cert)); } else { LOG(ERROR) << AT << "Failed to get certificate."; _hidl_cb(KeystoreStatusCode::ERROR_UNKNOWN, {}); |