Snap for 8046958 from 56c4ebcd3ccab614b134b0485d0d199d64ce6d37 to tm-release (c160d719) · Commits · e / os / android_hardware_interfaces

automotive/can/1.0/tools/libprotocan/Android.bp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@ package {

	cc_library_static {		cc_library_static {
	name: "libprotocan",		name: "libprotocan",
	defaults: ["android.hardware.automotive.vehicle@2.0-protocan-defaults"],		defaults: ["android.hardware.automotive.can@defaults"],
	vendor: true,		vendor: true,
	srcs: [		srcs: [
	"Checksum.cpp",		"Checksum.cpp",

automotive/vehicle/aidl/impl/utils/common/include/VehicleUtils.h

+42 −2

Original line number	Original line	Diff line number	Diff line
	@@ -213,7 +213,7 @@ template <class T>
	::ndk::ScopedAStatus toScopedAStatus(		::ndk::ScopedAStatus toScopedAStatus(
	const ::android::base::Result<T>& result,		const ::android::base::Result<T>& result,
	::aidl::android::hardware::automotive::vehicle::StatusCode status,		::aidl::android::hardware::automotive::vehicle::StatusCode status,
	std::string additionalErrorMsg) {		const std::string& additionalErrorMsg) {
	if (result.ok()) {		if (result.ok()) {
	return ::ndk::ScopedAStatus::ok();		return ::ndk::ScopedAStatus::ok();
	}		}
	@@ -236,10 +236,50 @@ template <class T>

	template <class T>		template <class T>
	::ndk::ScopedAStatus toScopedAStatus(const ::android::base::Result<T>& result,		::ndk::ScopedAStatus toScopedAStatus(const ::android::base::Result<T>& result,
	std::string additionalErrorMsg) {		const std::string& additionalErrorMsg) {
	return toScopedAStatus(result, getErrorCode(result), additionalErrorMsg);		return toScopedAStatus(result, getErrorCode(result), additionalErrorMsg);
	}		}

			// Check whether the value is valid according to config.
			// We check for the following:
			// * If the type is INT32, {@code value.int32Values} must contain one element.
			// * If the type is INT32_VEC, {@code value.int32Values} must contain at least one element.
			// * If the type is INT64, {@code value.int64Values} must contain one element.
			// * If the type is INT64_VEC, {@code value.int64Values} must contain at least one element.
			// * If the type is FLOAT, {@code value.floatValues} must contain one element.
			// * If the type is FLOAT_VEC, {@code value.floatValues} must contain at least one element.
			// * If the type is MIXED, see checkVendorMixedPropValue.
			::android::base::Result<void> checkPropValue(
			const ::aidl::android::hardware::automotive::vehicle::VehiclePropValue& value,
			const ::aidl::android::hardware::automotive::vehicle::VehiclePropConfig* config);

			// Check whether the Mixed type value is valid according to config.
			// We check for the following:
			// * configArray[1] + configArray[2] + configArray[3] must be equal to the number of
			// {@code value.int32Values} elements.
			// * configArray[4] + configArray[5] must be equal to the number of {@code value.int64Values}
			// elements.
			// * configArray[6] + configArray[7] must be equal to the number of {@code value.floatValues}
			// elements.
			// * configArray[8] must be equal to the number of {@code value.byteValues} elements.
			::android::base::Result<void> checkVendorMixedPropValue(
			const ::aidl::android::hardware::automotive::vehicle::VehiclePropValue& value,
			const ::aidl::android::hardware::automotive::vehicle::VehiclePropConfig* config);

			// Check whether the value is within the configured range.
			// We check for the following types:
			// * If type is INT32 or INT32_VEC, all {@code value.int32Values} elements must be within
			// {@code minInt32Value} and {@code maxInt32Value} if either of them is not 0.
			// * If type is INT64 or INT64_VEC, all {@code value.int64Values} elements must be within
			// {@code minInt64Value} and {@code maxInt64Value} if either of them is not 0.
			// * If type is FLOAT or FLOAT_VEC, all {@code value.floatValues} elements must be within
			// {@code minFloatValues} and {@code maxFloatValues} if either of them is not 0.
			// We don't check other types. If more checks are required, they should be added in VehicleHardware
			// implementation.
			::android::base::Result<void> checkValueRange(
			const ::aidl::android::hardware::automotive::vehicle::VehiclePropValue& value,
			const ::aidl::android::hardware::automotive::vehicle::VehicleAreaConfig* config);

	} // namespace vehicle		} // namespace vehicle
	} // namespace automotive		} // namespace automotive
	} // namespace hardware		} // namespace hardware

automotive/vehicle/aidl/impl/utils/common/src/VehicleUtils.cpp

0 → 100644

+210 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2021 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include "VehicleUtils.h"

			namespace android {
			namespace hardware {
			namespace automotive {
			namespace vehicle {

			using ::aidl::android::hardware::automotive::vehicle::VehicleAreaConfig;
			using ::aidl::android::hardware::automotive::vehicle::VehiclePropConfig;
			using ::aidl::android::hardware::automotive::vehicle::VehiclePropertyGroup;
			using ::aidl::android::hardware::automotive::vehicle::VehiclePropertyType;
			using ::aidl::android::hardware::automotive::vehicle::VehiclePropValue;
			using ::android::base::Error;
			using ::android::base::Result;
			using ::ndk::ScopedAStatus;

			Result<void> checkPropValue(const VehiclePropValue& value, const VehiclePropConfig* config) {
			int32_t property = value.prop;
			VehiclePropertyType type = getPropType(property);
			switch (type) {
			case VehiclePropertyType::BOOLEAN:
			[[fallthrough]];
			case VehiclePropertyType::INT32:
			if (value.value.int32Values.size() != 1) {
			return Error() << "expect 1 int32Values for INT32 type";
			}
			break;
			case VehiclePropertyType::INT32_VEC:
			if (value.value.int32Values.size() < 1) {
			return Error() << "expect >=1 int32Values for INT32_VEC type";
			}
			break;
			case VehiclePropertyType::INT64:
			if (value.value.int64Values.size() != 1) {
			return Error() << "expect 1 int64Values for INT64 type";
			}
			break;
			case VehiclePropertyType::INT64_VEC:
			if (value.value.int64Values.size() < 1) {
			return Error() << "expect >=1 int64Values for INT64_VEC type";
			}
			break;
			case VehiclePropertyType::FLOAT:
			if (value.value.floatValues.size() != 1) {
			return Error() << "expect 1 floatValues for FLOAT type";
			}
			break;
			case VehiclePropertyType::FLOAT_VEC:
			if (value.value.floatValues.size() < 1) {
			return Error() << "expect >=1 floatValues for FLOAT_VEC type";
			}
			break;
			case VehiclePropertyType::BYTES:
			// We allow setting an empty bytes array.
			break;
			case VehiclePropertyType::STRING:
			// We allow setting an empty string.
			break;
			case VehiclePropertyType::MIXED:
			if (getPropGroup(property) == VehiclePropertyGroup::VENDOR) {
			// We only checks vendor mixed properties.
			return checkVendorMixedPropValue(value, config);
			}
			break;
			default:
			return Error() << "unknown property type: " << toInt(type);
			}
			return {};
			}

			Result<void> checkVendorMixedPropValue(const VehiclePropValue& value,
			const VehiclePropConfig* config) {
			auto configArray = config->configArray;
			// configArray[0], 1 indicates the property has a String value, we allow the string value to
			// be empty.

			size_t int32Count = 0;
			// configArray[1], 1 indicates the property has a Boolean value.
			if (configArray[1] == 1) {
			int32Count++;
			}
			// configArray[2], 1 indicates the property has an Integer value.
			if (configArray[2] == 1) {
			int32Count++;
			}
			// configArray[3], the number indicates the size of Integer[] in the property.
			int32Count += static_cast<size_t>(configArray[3]);
			size_t int32Size = value.value.int32Values.size();
			if (int32Size != int32Count) {
			return Error() << "invalid mixed property, got " << int32Size << " int32Values, expect "
			<< int32Count;
			}

			size_t int64Count = 0;
			// configArray[4], 1 indicates the property has a Long value.
			if (configArray[4] == 1) {
			int64Count++;
			}
			// configArray[5], the number indicates the size of Long[] in the property.
			int64Count += static_cast<size_t>(configArray[5]);
			size_t int64Size = value.value.int64Values.size();
			if (int64Size != int64Count) {
			return Error() << "invalid mixed property, got " << int64Size << " int64Values, expect "
			<< int64Count;
			}

			size_t floatCount = 0;
			// configArray[6], 1 indicates the property has a Float value.
			if (configArray[6] == 1) {
			floatCount++;
			}
			// configArray[7], the number indicates the size of Float[] in the property.
			floatCount += static_cast<size_t>(configArray[7]);
			size_t floatSize = value.value.floatValues.size();
			if (floatSize != floatCount) {
			return Error() << "invalid mixed property, got " << floatSize << " floatValues, expect "
			<< floatCount;
			}

			// configArray[8], the number indicates the size of byte[] in the property.
			size_t byteSize = value.value.byteValues.size();
			size_t byteCount = static_cast<size_t>(configArray[8]);
			if (byteCount != 0 && byteSize != byteCount) {
			return Error() << "invalid mixed property, got " << byteSize << " byteValues, expect "
			<< byteCount;
			}
			return {};
			}

			Result<void> checkValueRange(const VehiclePropValue& value, const VehicleAreaConfig* areaConfig) {
			if (areaConfig == nullptr) {
			return {};
			}
			int32_t property = value.prop;
			VehiclePropertyType type = getPropType(property);
			switch (type) {
			case VehiclePropertyType::INT32:
			[[fallthrough]];
			case VehiclePropertyType::INT32_VEC:
			if (areaConfig->minInt32Value == 0 && areaConfig->maxInt32Value == 0) {
			break;
			}
			for (int32_t int32Value : value.value.int32Values) {
			if (int32Value < areaConfig->minInt32Value \|\|
			int32Value > areaConfig->maxInt32Value) {
			return Error() << "int32Value: " << int32Value
			<< " out of range, min: " << areaConfig->minInt32Value
			<< " max: " << areaConfig->maxInt32Value;
			}
			}
			break;
			case VehiclePropertyType::INT64:
			[[fallthrough]];
			case VehiclePropertyType::INT64_VEC:
			if (areaConfig->minInt64Value == 0 && areaConfig->maxInt64Value == 0) {
			break;
			}
			for (int64_t int64Value : value.value.int64Values) {
			if (int64Value < areaConfig->minInt64Value \|\|
			int64Value > areaConfig->maxInt64Value) {
			return Error() << "int64Value: " << int64Value
			<< " out of range, min: " << areaConfig->minInt64Value
			<< " max: " << areaConfig->maxInt64Value;
			}
			}
			break;
			case VehiclePropertyType::FLOAT:
			[[fallthrough]];
			case VehiclePropertyType::FLOAT_VEC:
			if (areaConfig->minFloatValue == 0.f && areaConfig->maxFloatValue == 0.f) {
			break;
			}
			for (float floatValue : value.value.floatValues) {
			if (floatValue < areaConfig->minFloatValue \|\|
			floatValue > areaConfig->maxFloatValue) {
			return Error() << "floatValue: " << floatValue
			<< " out of range, min: " << areaConfig->minFloatValue
			<< " max: " << areaConfig->maxFloatValue;
			}
			}
			break;
			default:
			// We don't check the rest of property types. Additional logic needs to be added if
			// required in VehicleHardware, e.g. you might want to check the range for mixed
			// property.
			break;
			}
			return {};
			}

			} // namespace vehicle
			} // namespace automotive
			} // namespace hardware
			} // namespace android

automotive/vehicle/aidl/impl/utils/common/test/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@ cc_test {
	"libgtest",		"libgtest",
	"libgmock",		"libgmock",
	],		],
			header_libs: ["VehicleHalTestUtilHeaders"],
	defaults: ["VehicleHalDefaults"],		defaults: ["VehicleHalDefaults"],
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	}		}

automotive/vehicle/aidl/impl/utils/common/test/VehicleUtilsTest.cpp

+458 −0

File changed.

Preview size limit exceeded, changes collapsed.