diff options
-rw-r--r-- | keystore/key_store_service.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp index 2a75c45b..c8310853 100644 --- a/keystore/key_store_service.cpp +++ b/keystore/key_store_service.cpp @@ -1708,11 +1708,9 @@ KeyStoreService::attestDeviceIds(const KeymasterArguments& params, } // Generate temporary key. - sp<Keymaster> dev; - SecurityLevel securityLevel; - std::tie(dev, securityLevel) = mKeyStore->getMostSecureDevice(); + sp<Keymaster> dev = mKeyStore->getDevice(SecurityLevel::TRUSTED_ENVIRONMENT); - if (securityLevel == SecurityLevel::SOFTWARE) { + if (!dev) { *aidl_return = static_cast<int32_t>(ResponseCode::SYSTEM_ERROR); return Status::ok(); } |