Merge "Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855" into stage-aosp-master (8ac301f5) · Commits · e / os / android_hardware_interfaces

audio/common/all-versions/default/service/android.hardware.audio.service.rc

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service
		class hal
		user audioserver
		# media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
		group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct wakelock
		group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct wakelock context_hub
		capabilities BLOCK_SUSPEND
		ioprio rt 4
		task_profiles ProcessCapacityHigh HighPerformance

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ Return<void> VehicleHalManager::getPropConfigs(const hidl_vec<int32_t> &properti
		} else {
		ALOGW("Requested config for undefined property: 0x%x", prop);
		_hidl_cb(StatusCode::INVALID_ARG, hidl_vec<VehiclePropConfig>());
		return Void();
		}
		}

+20 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,20 @@ const ConfigDeclaration kVehicleProperties[]{
		.changeMode = VehiclePropertyChangeMode::STATIC,
		},
		.initialValue = {.stringValue = "Toy Vehicle"}},
		{.config =
		{
		.prop = toInt(VehicleProperty::INFO_MODEL),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::STATIC,
		},
		.initialValue = {.stringValue = "Speedy Model"}},
		{.config =
		{
		.prop = toInt(VehicleProperty::INFO_MODEL_YEAR),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::STATIC,
		},
		.initialValue = {.int32Values = {2020}}},
		{.config =
		{
		.prop = toInt(VehicleProperty::INFO_EXTERIOR_DIMENSIONS),
		@@ -674,6 +688,12 @@ const ConfigDeclaration kVehicleProperties[]{
		.prop = toInt(VehicleProperty::GEAR_SELECTION),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.configArray = {(int)VehicleGear::GEAR_PARK,
		(int)VehicleGear::GEAR_NEUTRAL,
		(int)VehicleGear::GEAR_REVERSE,
		(int)VehicleGear::GEAR_DRIVE, (int)VehicleGear::GEAR_1,
		(int)VehicleGear::GEAR_2, (int)VehicleGear::GEAR_3,
		(int)VehicleGear::GEAR_4, (int)VehicleGear::GEAR_5},
		},
		.initialValue = {.int32Values = {toInt(VehicleGear::GEAR_PARK)}}},

+0 −5

Original line number	Diff line number	Diff line
		@@ -141,11 +141,6 @@ Result<void> parseUserAssociations(const hidl_vec<int32_t>& int32Values, size_t
		template <typename T>
		Result<T> verifyAndCast(int32_t value) {
		T castValue = static_cast<T>(value);
		const auto iter = hidl_enum_range<T>();
		if (castValue < iter.begin() \|\| castValue > std::prev(iter.end())) {
		return Error() << "Value " << value << " not in range [" << toString(*iter.begin()) << ", "
		<< toString(*std::prev(iter.end())) << "]";
		}
		for (const auto& v : hidl_enum_range<T>()) {
		if (castValue == v) {
		return castValue;

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		<configuration description="Runs VtsHalDrmV1_0TargetTest.">
		<option name="test-suite-tag" value="apct" />
		<option name="test-suite-tag" value="apct-native" />
		<option name="not-shardable" value="true" />

		<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>