commit a970ec3877d8a20a3239c408ae10faa803d17760
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 14:32:32 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 14:32:32 2020 +0000
tree 933cf47f9341aa3314fc59e37041e83c7eb85293
parent 10938d3e263445c48ca5e48e05544603bcb96f79
parent 4f0fd48c0165abce7587ee9c8c2dd521d81ebc1c

Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 am: 4f0fd48c01

Change-Id: Ibf9b3f005e55400ac2c2a1f02e499950438a53df

keystore/keystore_main.cpp

diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp
index 7b7430f..02c2139 100644
--- a/keystore/keystore_main.cpp
+++ b/keystore/keystore_main.cpp
@@ -114,6 +114,7 @@
         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();