diff options
| author | Manish Dwivedi <manishdwivedi@google.com> | 2021-06-17 20:44:05 +0000 |
|---|---|---|
| committer | Janis Danisevskis <jdanis@google.com> | 2022-01-05 22:51:11 +0000 |
| commit | f22057545d10e6a515722fdbf23c757ee5a1d68b (patch) | |
| tree | a4733a49c08944ab48c012058b4885cfbf8021a7 | |
| parent | e2dac5e29747c1ae2d714341c0ca9e397be70e3f (diff) | |
| download | security-f22057545d10e6a515722fdbf23c757ee5a1d68b.tar.gz | |
To initialize StrongBox KM with TEE KM
Ignore-AOSP-First: Cherry-picked from AOSP.
Test: Run Keystore CTS tests
Bug: b/191171542
Merged-In: I0f2c6d4e1d7a3fda973bcf65fd967119cbd52337
Change-Id: I0f2c6d4e1d7a3fda973bcf65fd967119cbd52337
| -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; |