tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Change-Id: Ibf9b3f005e55400ac2c2a1f02e499950438a53df
This commit is contained in:
Automerger Merge Worker 2020-02-20 14:32:32 +00:00
commit a970ec3877
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
keystore/keystore_main.cpp
View file

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