HFPC: Add property to configure driver safety indicator (bc2e9209) · Commits · e / os / android_packages_modules_Bluetooth

android/pandora/test/hfpclient_test.py

0 → 100644

+240 −0

Original line number	Diff line number	Diff line
		# Copyright 2023 Google LLC
		#
		# 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
		#
		# https://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.

		import asyncio
		import avatar
		import logging

		from avatar import BumblePandoraDevice, PandoraDevice, PandoraDevices
		from avatar.pandora_server import AndroidPandoraServer
		from bumble.core import (
		BT_GENERIC_AUDIO_SERVICE,
		BT_HANDSFREE_AUDIO_GATEWAY_SERVICE,
		BT_L2CAP_PROTOCOL_ID,
		BT_RFCOMM_PROTOCOL_ID,
		)
		from bumble.rfcomm import Server as RfcommServer, DLC
		from bumble.sdp import (
		DataElement,
		ServiceAttribute,
		SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
		SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
		SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
		SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
		)
		from bumble.hfp import HfpProtocol
		from mobly import base_test, test_runner
		from mobly.asserts import assert_equal # type: ignore
		from mobly.asserts import assert_not_equal # type: ignore
		from mobly.asserts import assert_in # type: ignore
		from mobly.asserts import assert_not_in # type: ignore
		from pandora.host_pb2 import Connection as PandoraConnection
		from pandora.security_pb2 import LEVEL2
		from typing import Optional, Tuple, List, Dict

		SDP_PROFILE_SUPPORTED_FEATURES_ID = 0x0311

		HFP_AG_FEATURE_HF_INDICATORS = (1 << 10)

		HFP_HF_FEATURE_HF_INDICATORS = (1 << 8)
		HFP_HF_FEATURE_DEFAULT = hex(0x01b5)

		PROPERTY_HF_ENABLED = 'bluetooth.profile.hfp.hf.enabled'
		PROPERTY_HF_FEATURES = 'bluetooth.hfp.hf_client_features.config'
		PROPERTY_HF_INDICATOR_ENHANCED_DRIVER_SAFETY = 'bluetooth.headset_client.indicator.enhanced_driver_safety.enabled'


		class HfpClientTest(base_test.BaseTestClass): # type: ignore[misc]
		devices: Optional[PandoraDevices] = None

		# pandora devices.
		dut: PandoraDevice
		ref: BumblePandoraDevice

		def setup_class(self) -> None:
		self.devices = PandoraDevices(self)
		self.dut, ref, *_ = self.devices
		assert isinstance(ref, BumblePandoraDevice)
		self.ref = ref

		# Enable BR/EDR mode and SSP for Bumble devices.
		self.ref.config.setdefault('classic_enabled', True)
		self.ref.config.setdefault('classic_ssp_enabled', True)
		self.ref.config.setdefault(
		'server',
		{
		'io_capability': 'no_output_no_input',
		},
		)

		for server in self.devices._servers:
		if isinstance(server, AndroidPandoraServer):
		self.dut_adb = server.device.adb
		# Enable HFP Client
		self.dut_adb.shell(['setprop', PROPERTY_HF_ENABLED, 'true'])
		# Set HF features if not set yet
		hf_feature_text = self.dut_adb.getprop(PROPERTY_HF_FEATURES)
		if len(hf_feature_text) == 0:
		self.dut_adb.shell(['setprop', PROPERTY_HF_FEATURES, HFP_HF_FEATURE_DEFAULT])
		break

		def teardown_class(self) -> None:
		if self.devices:
		self.devices.stop_all()

		@avatar.asynchronous
		async def setup_test(self) -> None:
		await asyncio.gather(self.dut.reset(), self.ref.reset())

		async def make_classic_connection(self) -> Tuple[PandoraConnection, PandoraConnection]:
		dut_ref, ref_dut = await asyncio.gather(
		self.dut.aio.host.WaitConnection(address=self.ref.address),
		self.ref.aio.host.Connect(address=self.dut.address),
		)

		assert_equal(dut_ref.result_variant(), 'connection')
		assert_equal(ref_dut.result_variant(), 'connection')
		assert dut_ref.connection is not None and ref_dut.connection is not None

		return dut_ref.connection, ref_dut.connection

		async def make_classic_bond(self, dut_ref: PandoraConnection, ref_dut: PandoraConnection) -> None:
		dut_ref_sec, ref_dut_sec = await asyncio.gather(
		self.dut.aio.security.Secure(connection=dut_ref, classic=LEVEL2),
		self.ref.aio.security.WaitSecurity(connection=ref_dut, classic=LEVEL2),
		)
		assert_equal(dut_ref_sec.result_variant(), 'success')
		assert_equal(ref_dut_sec.result_variant(), 'success')

		async def make_hfp_connection(self) -> HfpProtocol:
		# Listen RFCOMM
		dlc_connected = asyncio.get_running_loop().create_future()

		def on_dlc(dlc: DLC) -> None:
		dlc_connected.set_result(dlc)

		rfcomm_server = RfcommServer(self.ref.device)
		channel_number = rfcomm_server.listen(on_dlc)

		# Setup SDP records
		self.ref.device.sdp_service_records = make_sdp_records(channel_number)

		# Connect and pair
		dut_ref, ref_dut = await self.make_classic_connection()
		await self.make_classic_bond(dut_ref, ref_dut)

		# By default, Android HF should auto connect
		dlc = await dlc_connected
		assert isinstance(dlc, DLC)

		return HfpProtocol(dlc)

		@avatar.parameterized((True,), (False,)) # type: ignore[misc]
		@avatar.asynchronous
		async def test_hf_indicator_setup(self, enhanced_driver_safety_enabled: bool) -> None:
		if enhanced_driver_safety_enabled:
		self.dut_adb.shell(['setprop', PROPERTY_HF_INDICATOR_ENHANCED_DRIVER_SAFETY, 'true'])
		else:
		self.dut_adb.shell(['setprop', PROPERTY_HF_INDICATOR_ENHANCED_DRIVER_SAFETY, 'false'])

		ref_dut_hfp_protocol = await self.make_hfp_connection()

		while True:
		line = await ref_dut_hfp_protocol.next_line()

		if line.startswith('AT+BRSF='):
		# HF indicators should be enabled
		hf_features = parse_hf_features(line)
		assert_not_equal(hf_features & HFP_HF_FEATURE_HF_INDICATORS, 0)
		ag_features = HFP_AG_FEATURE_HF_INDICATORS
		ref_dut_hfp_protocol.send_response_line(f'+BRSF: {ag_features}')
		ref_dut_hfp_protocol.send_response_line('OK')
		elif line.startswith('AT+BIND='):
		indicators = line[len('AT+BIND='):].split(',')
		if enhanced_driver_safety_enabled:
		assert_in('1', indicators)
		else:
		assert_not_in('1', indicators)
		ref_dut_hfp_protocol.send_response_line('OK')
		break
		elif line.startswith('AT+CIND=?'):
		ref_dut_hfp_protocol.send_response_line('+CIND: ("call",(0,1)),("callsetup",(0-3)),("service",(0-1)),'
		'("signal",(0-5)),("roam",(0,1)),("battchg",(0-5)),'
		'("callheld",(0-2))')
		ref_dut_hfp_protocol.send_response_line('OK')
		elif line.startswith('AT+CIND?'):
		ref_dut_hfp_protocol.send_response_line('+CIND: 0,0,1,4,1,5,0')
		ref_dut_hfp_protocol.send_response_line('OK')
		elif line.startswith((
		'AT+CLIP=',
		'AT+VGS=',
		'AT+BIA=',
		'AT+CMER=',
		'AT+XEVENT=',
		'AT+XAPL=',
		)):
		ref_dut_hfp_protocol.send_response_line('OK')
		else:
		ref_dut_hfp_protocol.send_response_line('ERROR')


		def parse_hf_features(response_line: str) -> int:
		assert response_line.startswith('AT+BRSF=')
		return int(response_line[len('AT+BRSF='):])


		def make_sdp_records(rfcomm_channel: int) -> Dict[int, List[ServiceAttribute]]:
		return {
		0x00010001: [
		ServiceAttribute(
		SDP_SERVICE_RECORD_HANDLE_ATTRIBUTE_ID,
		DataElement.unsigned_integer_32(0x00010001),
		),
		ServiceAttribute(
		SDP_SERVICE_CLASS_ID_LIST_ATTRIBUTE_ID,
		DataElement.sequence([
		DataElement.uuid(BT_HANDSFREE_AUDIO_GATEWAY_SERVICE),
		DataElement.uuid(BT_GENERIC_AUDIO_SERVICE),
		]),
		),
		ServiceAttribute(
		SDP_PROTOCOL_DESCRIPTOR_LIST_ATTRIBUTE_ID,
		DataElement.sequence([
		DataElement.sequence([DataElement.uuid(BT_L2CAP_PROTOCOL_ID)]),
		DataElement.sequence([
		DataElement.uuid(BT_RFCOMM_PROTOCOL_ID),
		DataElement.unsigned_integer_8(rfcomm_channel),
		]),
		]),
		),
		ServiceAttribute(
		SDP_BLUETOOTH_PROFILE_DESCRIPTOR_LIST_ATTRIBUTE_ID,
		DataElement.sequence([
		DataElement.sequence([
		DataElement.uuid(BT_HANDSFREE_AUDIO_GATEWAY_SERVICE),
		DataElement.unsigned_integer_16(0x0107),
		])
		]),
		),
		ServiceAttribute(
		SDP_PROFILE_SUPPORTED_FEATURES_ID,
		DataElement.unsigned_integer_16(0),
		),
		]
		}


		if __name__ == '__main__':
		logging.basicConfig(level=logging.DEBUG)
		test_runner.main() # type: ignore

android/pandora/test/main.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import cases.le_security_test
		import cases.security_test
		import gatt_test
		import smp_test
		import hfpclient_test

		_TEST_CLASSES_LIST = [
		cases.host_test.HostTest,
		@@ -30,6 +31,7 @@ _TEST_CLASSES_LIST = [
		smp_test.SmpTest,
		gatt_test.GattTest,
		asha_test.AshaTest,
		hfpclient_test.HfpClientTest,
		]

system/bta/hf_client/bta_hf_client_at.cc

+9 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,9 @@
		/* timeout (in milliseconds) for AT hold timer */
		#define BTA_HF_CLIENT_AT_HOLD_TIMEOUT 41

		static constexpr char kPropertyEnhancedDrivingIndicatorEnabled[] =
		"bluetooth.headset_client.indicator.enhanced_driver_safety.enabled";

		/******************************************************************************
		* SUPPORTED EVENT MESSAGES
		******************************************************************************/
		@@ -1860,8 +1863,12 @@ void bta_hf_client_send_at_bind(tBTA_HF_CLIENT_CB* client_cb, int step) {

		switch (step) {
		case 0: // List HF supported indicators
		// TODO: Add flags to determine enabled HF features
		if (osi_property_get_bool(kPropertyEnhancedDrivingIndicatorEnabled,
		false)) {
		buf = "AT+BIND=1,2\r";
		} else {
		buf = "AT+BIND=2\r";
		}
		cmd = BTA_HF_CLIENT_AT_BIND_SET_IND;
		break;
		case 1: // Read AG supported indicators