Merge "Check return from DeleteKey correctly." into oc-dev

am: c4f859d1b5

Change-Id: Ib41e416ab79a56cddbaa61084645f626b4a3b22b

diff --cc keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
index 570e33f,75ec2d5..9854947
--- 1/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
--- 2/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
+++ b/keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp
@@@ -540,17 -505,21 +540,24 @@@ class KeymasterHidlTest : public ::test
          return error;
      }
  
+     void CheckedDeleteKey(HidlBuf* key_blob, bool keep_key_blob = false) {
+         auto rc = DeleteKey(key_blob, keep_key_blob);
+         EXPECT_TRUE(rc == ErrorCode::OK || rc == ErrorCode::UNIMPLEMENTED);
+     }
+ 
+     void CheckedDeleteKey() { CheckedDeleteKey(&key_blob_); }
+ 
      ErrorCode GetCharacteristics(const HidlBuf& key_blob, const HidlBuf& client_id,
                                   const HidlBuf& app_data, KeyCharacteristics* key_characteristics) {
 -        ErrorCode error;
 -        keymaster_->getKeyCharacteristics(
 -            key_blob, client_id, app_data,
 -            [&](ErrorCode hidl_error, const KeyCharacteristics& hidl_key_characteristics) {
 -                error = hidl_error, *key_characteristics = hidl_key_characteristics;
 -            });
 +        ErrorCode error = ErrorCode::UNKNOWN_ERROR;
 +        EXPECT_TRUE(
 +            keymaster_
 +                ->getKeyCharacteristics(
 +                    key_blob, client_id, app_data,
 +                    [&](ErrorCode hidl_error, const KeyCharacteristics& hidl_key_characteristics) {
 +                        error = hidl_error, *key_characteristics = hidl_key_characteristics;
 +                    })
 +                .isOk());
          return error;
      }