Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f03e5551 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I2ecb670320a44594300b002638fb230910d25a93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c8a37376 4de610c6

security/keymint/support/remote_prov_utils.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -978,7 +978,7 @@ ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() { 
            return hwtrust::DiceChain::Kind::kVsr13;

            return hwtrust::DiceChain::Kind::kVsr13;

        case __ANDROID_API_U__:

        case __ANDROID_API_U__:

            return hwtrust::DiceChain::Kind::kVsr14;

            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;

            return hwtrust::DiceChain::Kind::kVsr15;

        default:

        default:

            return "Unsupported vendor API level: " + std::to_string(vendor_api_level);

            return "Unsupported vendor API level: " + std::to_string(vendor_api_level);