commit 9660a49c6e4264525743466d593285fba86fce73
author Shawn Willden <swillden@google.com> Thu Jul 12 17:51:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 12 17:51:25 2018 -0700
tree 8d1dca0a3f5d00f1c9e8e5e262ed7dbea696e1a1
parent bf22e279c496fe165c2e543e9a076a4b56004416
parent 2947d47475118ac2e754579779f69fcb78d11dec

Use TEE keymaster for ID attestation. am: 926f647663
am: 2947d47475

Change-Id: I02d1d6e267642a9c97a8c882e526f71da3f3748e

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 2a75c45..c831085 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1708,11 +1708,9 @@
     }
 
     // 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();
     }