diff options
| -rw-r--r-- | keystore2/src/km_compat/km_compat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp index 8d59a5a7..bb60047b 100644 --- a/keystore2/src/km_compat/km_compat.cpp +++ b/keystore2/src/km_compat/km_compat.cpp @@ -1340,7 +1340,7 @@ KeymasterDevices initializeKeymasters() { CHECK(serviceManager.get()) << "Failed to get ServiceManager"; auto result = enumerateKeymasterDevices<Keymaster4>(serviceManager.get()); auto softKeymaster = result[SecurityLevel::SOFTWARE]; - if (!result[SecurityLevel::TRUSTED_ENVIRONMENT]) { + if ((!result[SecurityLevel::TRUSTED_ENVIRONMENT]) && (!result[SecurityLevel::STRONGBOX])) { result = enumerateKeymasterDevices<Keymaster3>(serviceManager.get()); } if (softKeymaster) result[SecurityLevel::SOFTWARE] = softKeymaster; |