tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Vendor api level cannot use sdk api level" into main am: 4de610c690 am: f03e555146 am: 35f551b9b5

Browse source 
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>
This commit is contained in:
Treehugger Robot 2023-12-08 18:06:13 +00:00 committed by Automerger Merge Worker
commit 6adb349577
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
security/keymint/support/remote_prov_utils.cpp
View file

@ -978,7 +978,7 @@ ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() {
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);