Merge "Relax restrictions on supported API levels" into android15-tests-dev (c4001e9c) · Commits · e / os / android_hardware_interfaces

security/keymint/support/remote_prov_utils.cpp

+8 −9

Original line number	Diff line number	Diff line
		@@ -974,14 +974,13 @@ ErrMsgOr<bytevec> parseAndValidateAuthenticatedRequestSignedPayload(

		ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() {
		int vendor_api_level = ::android::base::GetIntProperty("ro.vendor.api_level", -1);
		switch (vendor_api_level) {
		case __ANDROID_API_T__:
		if (vendor_api_level <= __ANDROID_API_T__) {
		return hwtrust::DiceChain::Kind::kVsr13;
		case __ANDROID_API_U__:
		} else if (vendor_api_level == __ANDROID_API_U__) {
		return hwtrust::DiceChain::Kind::kVsr14;
		case 202404: /* TODO(b/315056516) Use a version macro for vendor API 24Q2 */
		} else if (vendor_api_level == 202404) {
		return hwtrust::DiceChain::Kind::kVsr15;
		default:
		} else {
		return "Unsupported vendor API level: " + std::to_string(vendor_api_level);
		}
		}