commit 81ff06ea7797f03d4dd08446808a6d2349127546
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 18:44:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 19 18:44:03 2020 +0000
tree 6ca5a4fe5325b46c28d4b83e5073c6de904b5ecb
parent de4f404080ed37a3f38f3a76cee65de8fd00ee98
parent 803b6971a74c17a0fde28c7e817ad74041460608

Merge "Making software km implementation both backup and default" am: 67be8d72bf am: 803b6971a7

Change-Id: Ib11f2cc51a2a262642911f2fff6da65f25c6fa63

keystore/keystore_main.cpp

diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp
index 02c2139..7b7430f 100644
--- a/keystore/keystore_main.cpp
+++ b/keystore/keystore_main.cpp
@@ -114,7 +114,6 @@
         LOG(WARNING) << "No secure Keymaster implementation found, but device offers insecure"
                         " Keymaster HAL. Using as default.";
         result[SecurityLevel::TRUSTED_ENVIRONMENT] = result[SecurityLevel::SOFTWARE];
-        result[SecurityLevel::SOFTWARE] = nullptr;
     }
     if (!result[SecurityLevel::SOFTWARE]) {
         auto fbdev = android::keystore::makeSoftwareKeymasterDevice();