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

Change-Id: Ie1a107c4904e8bcd507ec5d25cb61f98fe09f0b5
This commit is contained in:
Automerger Merge Worker 2020-02-19 18:32:18 +00:00
commit 803b6971a7

View file

@ -114,7 +114,6 @@ KeymasterDevices initializeKeymasters() {
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();