| commit | 7e15ba960f1d878c80a2364e630c31bb2a46d048 | [log] [tgz] |
|---|---|---|
| author | Seth Moore <sethmo@google.com> | Mon Dec 09 22:39:34 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 09 22:39:34 2024 +0000 |
| tree | 89f8880510fce36e5d854009ebf17dc9e5a51bc5 | |
| parent | bebc8974abd038e0a329647b03e1a2da666b59f2 [diff] | |
| parent | cdf50ec8459748bc136fb2742f93228c5251c10a [diff] |
Merge "Relax restrictions on supported API levels" into main am: cdf50ec845 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3398590 Change-Id: Ia3ac433476282ee5926ec8f1fbe213dcc424bdc6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;