commit cdf50ec8459748bc136fb2742f93228c5251c10a
author Seth Moore <sethmo@google.com> Mon Dec 09 22:18:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 09 22:18:01 2024 +0000
tree 457d2e12c839686e84037dd5f60818338418875b
parent c1bf5f8a6d640cadf8b9c5ca7afbe1f2c1710a65
parent 0e79b69696807a5943ad559fc5dec7366029acf1

Merge "Relax restrictions on supported API levels" into main

security/keymint/support/remote_prov_utils.cpp

diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp
index e11f021..fdc0f28 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -1005,7 +1005,7 @@
 
 ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() {
     int vendor_api_level = ::android::base::GetIntProperty("ro.vendor.api_level", -1);
-    if (vendor_api_level == __ANDROID_API_T__) {
+    if (vendor_api_level <= __ANDROID_API_T__) {
         return hwtrust::DiceChain::Kind::kVsr13;
     } else if (vendor_api_level == __ANDROID_API_U__) {
         return hwtrust::DiceChain::Kind::kVsr14;