commit c092adeb2bdc764e1fd7c995b73cae8750a27361
author David Zeuthen <zeuthen@google.com> Wed Feb 19 21:14:41 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 19 21:14:41 2020 +0000
tree d025024a2e11c38f22b29f1f43b36984a0dc96c4
parent 67be8d72bf777f9918acaedc9501a496535b9848
parent a6f9fba382f9ca6c9346494b850bce7aeba9c5f5

Merge "Port credstore to IdentityCredential AIDL."

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