commit 4b5af7ff7c6f57448f9b063da7fb0a6f3f2effed
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 06 21:56:58 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 06 21:56:58 2022 +0000
tree a4733a49c08944ab48c012058b4885cfbf8021a7
parent b7809d011aff1b46231c79d4f15d811d0858589a
parent f22057545d10e6a515722fdbf23c757ee5a1d68b

Merge "To initialize StrongBox KM with TEE KM" into sc-v2-dev

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 8d59a5a..bb60047 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -1340,7 +1340,7 @@
     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;