| commit | 6adb3495776e51d40a0184231e8f350fa89d9e60 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Dec 08 18:06:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 08 18:06:13 2023 +0000 |
| tree | 9dc49c431b9212425b1838284826518284bbe1fd | |
| parent | 3d8c680f0a217b4faed3ace590c9890eb6adb35e [diff] | |
| parent | 35f551b9b54c34bfe1b1a040f568973645849b1e [diff] |
Merge "Vendor api level cannot use sdk api level" into main am: 4de610c690 am: f03e555146 am: 35f551b9b5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865434 Change-Id: I902b1c99a7d9ec010b69802d9b331c2de66f7853 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);