commit 31a790838e9b001ca5476024bbfe13d6eb930891
author android-build-team Robot <android-build-team-robot@google.com> Sun Jul 15 03:01:39 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Jul 15 03:01:39 2018 +0000
tree 7bd5b9e872ca896d4a43e86f07c62c44ccabf59e
parent c557d4ba1dd551bf2b1189f770fe30364be0b164
parent 926f647663d589f7b16887ecd10162b64736e521

Snap for 4894342 from 926f647663d589f7b16887ecd10162b64736e521 to pi-dr1-release

Change-Id: I318deccf1834288b8dea4bcd69b6d73b76975887

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();
     }