Snap for 8847022 from cc4486f9742b14bb5e16c4ee40b64e021b7c2802 to tm-qpr1-release (7b980c84) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h

+11 −1

Original line number	Diff line number	Diff line
		@@ -363,8 +363,9 @@ const std::vector<ConfigDeclaration> kVehicleProperties = {
		.prop = toInt(VehicleProperty::VEHICLE_CURB_WEIGHT),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::STATIC,
		.configArray = {/gross weight kg=/2948},
		},
		.initialValue = {.int32Values = {30}}},
		.initialValue = {.int32Values = {2211 /kg/}}},

		{.config =
		{
		@@ -478,6 +479,15 @@ const std::vector<ConfigDeclaration> kVehicleProperties = {
		},
		.initialValue = {.int32Values = {(int)VehicleUnit::LITER}}},

		{.config =
		{
		.prop = toInt(
		VehicleProperty::FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = {.int32Values = {1}}},

		{.config =
		{
		.prop = toInt(VehicleProperty::HW_KEY_INPUT),

+3 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,9 @@ void BluetoothAudioSession::ReportAudioConfigChanged(
		if (session_type_ !=
		SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH &&
		session_type_ !=
		SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH) {
		SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH &&
		session_type_ !=
		SessionType::LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH) {
		return;
		}
		std::lock_guard<std::recursive_mutex> guard(mutex_);