diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 14:32:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-20 14:32:32 +0000 |
| commit | a970ec3877d8a20a3239c408ae10faa803d17760 (patch) | |
| tree | 933cf47f9341aa3314fc59e37041e83c7eb85293 | |
| parent | 10938d3e263445c48ca5e48e05544603bcb96f79 (diff) | |
| parent | 4f0fd48c0165abce7587ee9c8c2dd521d81ebc1c (diff) | |
| download | security-a970ec3877d8a20a3239c408ae10faa803d17760.tar.gz | |
Merge "Revert "Making software km implementation both backup and default"" am: 24dce34ad5 am: 4f0fd48c01
Change-Id: Ibf9b3f005e55400ac2c2a1f02e499950438a53df
| -rw-r--r-- | keystore/keystore_main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/keystore/keystore_main.cpp b/keystore/keystore_main.cpp index 7b7430f9..02c2139a 100644 --- a/keystore/keystore_main.cpp +++ b/keystore/keystore_main.cpp @@ -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(); |