| commit | f03e555146a31ceab42a281edbc8bd223f0d1c60 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Dec 08 17:03:32 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 17:03:32 2023 +0000 |
| tree | c5c7c0a8425149cf702682cb371205c985231728 | |
| parent | c8a37376ccd425fa4a0632bd7b81d7e381b1e9f9 [diff] | |
| parent | 4de610c69026eb1aaf3aaf2056727769d2fe1d83 [diff] |
Merge "Vendor api level cannot use sdk api level" into main am: 4de610c690 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865434 Change-Id: I2ecb670320a44594300b002638fb230910d25a93 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 bd1e557..ecfdfd2 100644 --- a/security/keymint/support/remote_prov_utils.cpp +++ b/security/keymint/support/remote_prov_utils.cpp
@@ -978,7 +978,7 @@ return hwtrust::DiceChain::Kind::kVsr13; case __ANDROID_API_U__: return hwtrust::DiceChain::Kind::kVsr14; - case __ANDROID_API_V__: + case 202404: /* TODO(b/315056516) Use a version macro for vendor API 24Q2 */ return hwtrust::DiceChain::Kind::kVsr15; default: return "Unsupported vendor API level: " + std::to_string(vendor_api_level);