commit 2d3f847bcc7b34406232c178b319b231ef801f09
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 18 00:42:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 18 00:42:25 2018 +0000
tree 48062469dccc7b00defbae143a52860402d73dfc
parent 9660a49c6e4264525743466d593285fba86fce73
parent 50234e6ffc90b7388372ab5f7b5c702b19666598

Merge "Fix unnecessary copy initialization warnings"

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 0a6d406..ccf7dfd 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();
     }