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

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2865434

Change-Id: I2ee9dc0bed9e15824c9fed811fcc59668291f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-12-08 17:33:45 +00:00
committed by Automerger Merge Worker

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);