commit 58b0f0655695f18c3ac6da1d0773e232d1b2e469
author Janis Danisevskis <jdanis@google.com> Wed Mar 22 20:46:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 22 20:46:43 2017 +0000
tree 4c0c16c364a3096a1211ae2500395fab0612edd0
parent 8f991deed1fc94695c1f3811385378d4f221c889
parent b77dbe37c10d9508275a8021ee7a99c10e0e1612

Merge "Check for unimplemented keymaster function delete_key"

keymaster/3.0/default/KeymasterDevice.cpp

diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp
index 24cf53a..0969355 100644
--- a/keymaster/3.0/default/KeymasterDevice.cpp
+++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -583,6 +583,9 @@
 }
 
 Return<ErrorCode> KeymasterDevice::deleteKey(const hidl_vec<uint8_t>& keyBlob) {
+    if (keymaster_device_->delete_key == nullptr) {
+        return ErrorCode::UNIMPLEMENTED;
+    }
     auto kmKeyBlob = hidlVec2KmKeyBlob(keyBlob);
     return legacy_enum_conversion(keymaster_device_->delete_key(keymaster_device_, &kmKeyBlob));
 }