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

Change-Id: Ib11f2cc51a2a262642911f2fff6da65f25c6fa63
This commit is contained in:
Automerger Merge Worker 2020-02-19 18:44:03 +00:00
commit 81ff06ea77

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