Snap for 12361654 from f1c542eaad99a99afae37d959cb4dac0eb469b40 to 24Q4-release (61e9abf6) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5531,7 +5531,7 @@ public class AdapterService extends Service {
		for (int i = 0; i < n; i++) {
		cb.accept(mBluetoothConnectionCallbacks.getBroadcastItem(i));
		}
		mRemoteCallbacks.finishBroadcast();
		mBluetoothConnectionCallbacks.finishBroadcast();
		}

		/**

android/pandora/mmi2grpc/mmi2grpc/init.py

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ from mmi2grpc.a2dp import A2DPProxy
		from mmi2grpc.avrcp import AVRCPProxy
		from mmi2grpc.gatt import GATTProxy
		from mmi2grpc.gap import GAPProxy
		from mmi2grpc.hap import HAPProxy
		from mmi2grpc.hfp import HFPProxy
		from mmi2grpc.hid import HIDProxy
		from mmi2grpc.hogp import HOGPProxy
		@@ -78,6 +79,7 @@ class IUT:
		self._avrcp = None
		self._bnep = None
		self._gatt = None
		self._hap = None
		self._gap = None
		self._hfp = None
		self._hid = None
		@@ -213,6 +215,11 @@ class IUT:
		if not self._gap:
		self._gap = GAPProxy(grpc.insecure_channel(f"localhost:{self.pandora_server_port}"), self.rootcanal)
		return self._gap.interact(test, interaction, description, pts_address)
		# Handles GAP MMIs.
		if profile in ("HAP"):
		if not self._hap:
		self._hap = HAPProxy(grpc.insecure_channel(f'localhost:{self.pandora_server_port}'), self.rootcanal)
		return self._hap.interact(test, interaction, description, pts_address)
		# Handles HFP MMIs.
		if profile in ("HFP"):
		if not self._hfp:

android/pandora/mmi2grpc/mmi2grpc/hap.py

0 → 100644

+327 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2024 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.ś

		import threading
		import uuid
		import string
		import random
		import time

		from mmi2grpc._audio import AudioSignal
		from mmi2grpc._helpers import assert_description, match_description
		from mmi2grpc._rootcanal import Dongle
		from mmi2grpc._proxy import ProfileProxy
		from pandora.host_grpc import Host
		from pandora.host_pb2 import RANDOM
		from pandora.security_grpc import Security
		from pandora.security_pb2 import LE_LEVEL3, PairingEventAnswer
		from pandora_experimental.hap_grpc import HAP
		from pandora_experimental.gatt_grpc import GATT
		from pandora_experimental.hap_pb2 import HaPlaybackAudioRequest

		BASE_UUID = uuid.UUID("00000000-0000-1000-8000-00805F9B34FB")
		SINK_ASE_UUID = 0x2BC4
		ASE_CONTROL_POINT_UUID = 0x2BC6
		HEARING_AID_PRESET_CONTROL_POINT_UUID = 0x2BDB
		ACTIVE_PRESET_INDEX_UUID = 0x2BDC
		CCCD_UUID = 0x2902

		AUDIO_SIGNAL_AMPLITUDE = 0.8
		AUDIO_SIGNAL_SAMPLING_RATE = 44100

		def short_uuid(full: uuid.UUID) -> int:
		return (uuid.UUID(full).int - BASE_UUID.int) >> 96

		class HAPProxy(ProfileProxy):

		def __init__(self, channel, rootcanal):
		super().__init__(channel)
		self.hap = HAP(channel)
		self.gatt = GATT(channel)
		self.host = Host(channel)
		self.security = Security(channel)
		self.pairing_events = self.security.OnPairing()
		self.discovered_services = None
		self.preset_list = None
		self.rootcanal = rootcanal
		self.connection = None

		def convert_frame(data):
		return HaPlaybackAudioRequest(data=data, source=self.source)

		self.audio = AudioSignal(lambda frames: self.hap.HaPlaybackAudio(map(convert_frame, frames)),
		AUDIO_SIGNAL_AMPLITUDE, AUDIO_SIGNAL_SAMPLING_RATE)

		def test_started(self, test: str, **kwargs):
		self.rootcanal.select_pts_dongle(Dongle.LAIRD_BL654)
		return "OK"

		@assert_description
		def MMI_IUT_MTU_EXCHANGE(self, **kwargs):
		"""
		Please send exchange MTU command to the PTS with MTU size greater than
		49.
		"""

		assert self.connection is not None
		self.gatt.ExchangeMTU(mtu=512, connection=self.connection)
		return "OK"

		@match_description
		def ORDER_IUT_SEND_PRESET_WRITE_NAME(self, test: str, index: str, **kwargs):
		"""
		Please write preset name to index: (?P<index>[0-9]*) with random string.
		"""

		assert self.connection is not None

		# This MMI can be called multiple times, wait only for the first time
		if not self.preset_list:
		# Android reads all presets after device is paired. Wait for initial preset record before sending next request.
		self.preset_list = self.hap.WaitPresetChanged().preset_record_list
		assert self.preset_list

		preset_name = ''.join(random.choice(string.ascii_lowercase) for i in range(10))

		self.hap.WritePresetName(connection=self.connection, index=int(index), name=preset_name)

		return "OK"

		@assert_description
		def IUT_ORDER_WRITE_READ_ALL_PRESET(self, test: str, **kwargs):
		"""
		Please write Read Preset opcode with index 0x01 and num presets to 0xff.
		"""

		assert self.connection is not None

		self.preset_list = self.hap.WaitPresetChanged()
		assert self.preset_list

		responseMessage = self.hap.GetAllPresetRecords(connection=self.connection)

		self.log(f"Received preset record:\n")
		for presetRecord in responseMessage.preset_record_list:
		self.log(f" Index: {presetRecord.index}\n"
		f" Name: {presetRecord.name}\n"
		f" Writable: {presetRecord.isWritable}\n"
		f" Available: {presetRecord.isAvailable}\n")

		return "OK"

		@assert_description
		def IUT_CONFIRM_READY_TO_RECEIVE_preset_list(self, test: str, **kwargs):
		"""
		Please click OK when IUT is ready to receive Preset Changed message.
		"""

		self.preset_list = self.hap.WaitPresetChanged().preset_record_list
		assert self.preset_list

		return "OK"

		@assert_description
		def IUT_CONFIRM_NEW_PRESET_RECORD(self, test: str, **kwargs):
		"""
		Please confirm that new preset record was added to IUT's internal list.
		"""

		return "OK"

		@match_description
		def IUT_READ_PRESET_INDEX(self, test: str, index: str, num_presets: str, **kwargs):
		"""
		Please write Read Preset Index opcode with index: (?P<index>[0-9]), numPresets: (?P<num_presets>[0-9]).
		"""

		assert self.connection is not None

		# Android reads all presets after device is paired. Wait for initial preset record before sending next request.
		self.preset_list = self.hap.WaitPresetChanged().preset_record_list
		assert self.preset_list

		responseMessage = self.hap.GetPresetRecord(connection=self.connection, index=int(index))

		self.log(f"Received preset record:\n"
		f" Index: {responseMessage.preset_record.index}\n"
		f" Name: {responseMessage.preset_record.name}\n"
		f" Writable: {responseMessage.preset_record.isWritable}\n"
		f" Available: {responseMessage.preset_record.isAvailable}\n")

		return "OK"

		@assert_description
		def IUT_CONFIGURE_TO_STREAMING_STATE(self, test: str, **kwargs):
		"""
		Please configure to Streaming state.
		"""

		self.audio.start()

		return "OK"

		@match_description
		def IUT_ORDER_WRITE_SET_ACTIVE_PRESET_INDEX_SYNC_LOCALLY(self, test: str, index: str, **kwargs):
		"""
		Please write Set Active Preset Synchronized Locally opcode with index: (?P<index>[0-9]*).
		"""

		self.hap.SetActivePreset(connection=self.connection, index=int(index))

		return "OK"

		@assert_description
		def IUT_ORDER_WRITE_SET_NEXT_PRESET_INDEX_SYNC_LOCALLY(self, test: str, **kwargs):
		"""
		Please write Set Next Preset Synchronized Locally opcode
		"""

		self.hap.SetNextPreset(connection=self.connection)

		return "OK"

		@assert_description
		def IUT_ORDER_WRITE_SET_PREVIOUS_PRESET_INDEX_SYNC_LOCALLY(self, test: str, **kwargs):
		"""
		Please write Set Previous Preset Synchronized Locally opcode.
		"""

		self.hap.SetPreviousPreset(connection=self.connection)

		return "OK"

		@match_description
		def IUT_ORDER_WRITE_SET_ACTIVE_PRESET_INDEX_DO_NOT_EXPECT_TO_RECEIVE(self, test: str, index: str, **kwargs):
		"""
		Please write Set Active Preset opcode with index: (?P<index>[0-9]*). Do not expect to
		receive the message
		"""

		self.hap.SetActivePreset(connection=self.connection, index=int(index))

		return "OK"

		@assert_description
		def IUT_CONFIRM_READY_TO_RECEIVE_PRESET_CHANGED(self, test: str, **kwargs):
		"""
		Please click OK when IUT is ready to receive Preset Changed message.
		"""

		return "OK"

		@match_description
		def IUT_ORDER_WRITE_SET_ACTIVE_PRESET_INDEX(self, test: str, index: str, **kwargs):
		"""
		Please write Set Active Preset opcode with index: (?P<index>[0-9]*).
		"""

		self.hap.SetActivePreset(connection=self.connection, index=int(index))

		return "OK"

		@match_description
		def _mmi_2004(self, pts_addr: bytes, passkey: str, **kwargs):
		"""
		Please confirm that 6 digit number is matched with (?P<passkey>[0-9]+).
		"""

		for event in self.pairing_events:
		if event.address == pts_addr and event.numeric_comparison == int(passkey):
		self.pairing_events.send(PairingEventAnswer(
		event=event,
		confirm=True,
		))
		return "OK"

		assert False

		@assert_description
		def _mmi_20100(self, test, pts_addr: bytes, **kwargs):
		"""
		Please initiate a GATT connection to the PTS.

		Description: Verify that
		the Implementation Under Test (IUT) can initiate a GATT connect request
		to the PTS.
		"""

		self.connection = self.host.ConnectLE(own_address_type=RANDOM, public=pts_addr).connection

		def secure():
		self.security.Secure(connection=self.connection, le=LE_LEVEL3)

		threading.Thread(target=secure).start()

		return "OK"

		@match_description
		def _mmi_20103(self, **kwargs):
		"""
		Please take action to discover the (Active Preset Index\|Hearing Aid Features) characteristic
		from the Hearing Access. Discover the primary service if needed.
		Description: Verify that the Implementation Under Test \(IUT\) can send
		Discover All Characteristics command.
		"""

		return "OK"

		@match_description
		def _mmi_20106(self, test: str, characteristic_name: str, type: str, **kwargs):
		"""
		Please write to Client Characteristic Configuration Descriptor
		of (?P<characteristic_name>(ASE Control Point\|Sink Audio Stream Endpoint\|Active Preset Index))
		characteristic to enable (?P<type>(notification\|indication)).
		"""

		return "OK"

		@match_description
		def _mmi_20107(self, test: str, characteristic_name: str, handle: str, **kwargs):
		"""
		Please send Read Request to read (?P<characteristic_name>.) characteristic with handle = (?P<handle>\S).
		"""

		handle = int(handle, base=16)

		self.gatt.ReadCharacteristicFromHandle(
		connection=self.connection,
		handle=handle,
		)

		return "OK"

		@assert_description
		def _mmi_20206(self, **kwargs):
		"""
		Please verify that for each supported characteristic, attribute
		handle/UUID pair(s) is returned to the upper tester.Hearing Aid
		Features: Attribute Handle = 0x00D4
		Characteristic Properties = 0x12
		Handle = 0x00D5
		UUID = 0x2BDA

		Hearing Aid Preset Control Point:
		Attribute Handle = 0x00D1
		Characteristic Properties = 0x38
		Handle =
		0x00D2
		UUID = 0x2BDB

		Active Preset Index: Attribute Handle = 0x00D7
		Characteristic Properties = 0x12
		Handle = 0x00D8
		UUID = 0x2BDC
		"""

		return "OK"

android/pandora/server/configs/PtsBotTest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@
		<option name="profile" value="BNEP" />
		<option name="profile" value="GAP" />
		<option name="profile" value="GATT" />
		<option name="profile" value="HAP" />
		<option name="profile" value="HFP/AG" />
		<option name="profile" value="HFP/HF" />
		<option name="profile" value="HID/HOS" />

android/pandora/server/configs/pts_bot_tests_config.json

+47 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,15 @@
		"GATT/SR/GAW/BI-13-C",
		"GATT/SR/UNS/BI-01-C",
		"GATT/SR/UNS/BI-02-C",
		"HAP/HARC/CGGIT/CHA/BV-03-C",
		"HAP/HARC/CGGIT/CHA/BV-04-C",
		"HAP/HARC/CFG/BV-01-C",
		"HAP/HARC/PRE/BV-11-C",
		"HAP/HARC/PRE/BV-12-C",
		"HAP/HARC/PRE/BV-14-C",
		"HAP/HARC/PRE/BV-15-C",
		"HAP/HARC/PRE/BV-16-C",
		"HAP/HAUC/SGGIT/SER/BV-01-C",
		"HFP/AG/ACC/BV-09-I",
		"HFP/AG/ACC/BV-15-I",
		"HFP/AG/ACR/BV-01-I",
		@@ -926,6 +935,33 @@
		"GATT/SR/GAW/BV-09-C",
		"GATT/SR/GAW/BV-10-C",
		"GATT/SR/GAW/BV-11-C",
		"HAP/HARC/DISC/BV-01-C",
		"HAP/HARC/DISC/BV-01-C_LT2",
		"HAP/HARC/PRE/BV-02-C",
		"HAP/HARC/PRE/BV-02-C_LT2",
		"HAP/HARC/PRE/BV-03-C",
		"HAP/HARC/PRE/BV-03-C_LT2",
		"HAP/HARC/PRE/BV-04-C",
		"HAP/HARC/PRE/BV-04-C_LT2",
		"HAP/HARC/PRE/BV-05-C",
		"HAP/HARC/PRE/BV-05-C_LT2",
		"HAP/HARC/PRE/BV-06-C",
		"HAP/HARC/PRE/BV-06-C_LT2",
		"HAP/HARC/PRE/BV-07-C",
		"HAP/HARC/PRE/BV-07-C_LT2",
		"HAP/HARC/PRE/BV-08-C",
		"HAP/HARC/PRE/BV-08-C_LT2",
		"HAP/HARC/PRE/BV-09-C",
		"HAP/HARC/PRE/BV-09-C_LT2",
		"HAP/HARC/PRE/BV-10-C",
		"HAP/HARC/PRE/BV-10-C_LT2",
		"HAP/HARC/PRE/BV-13-C",
		"HAP/HARC/PRE/BV-13-C_LT2",
		"HAP/HARC/PRE/BV-18-C",
		"HAP/HARC/PRE/BV-18-C_LT2",
		"HAP/HAUC/DISC/BV-01-C",
		"HAP/HAUC/DISC/BV-01-C_LT2",
		"HAP/HAUC/STR/BV-01-C",
		"HFP/AG/ACC/BI-12-I",
		"HFP/AG/ACC/BI-13-I",
		"HFP/AG/ACC/BI-14-I",
		@@ -2141,6 +2177,7 @@
		"TSPC_HAP_1_2": true,
		"TSPC_HAP_1_3": true,
		"TSPC_HAP_2_2": true,
		"TSPC_HAP_17_1": false,
		"TSPC_HAP_40_1": true,
		"TSPC_HAP_43_1": true,
		"TSPC_HAP_43_2": true,
		@@ -3095,6 +3132,7 @@
		"GATT": {},
		"GAVDP": {},
		"HCI": {},
		"HAP": {},
		"HFP": {
		"TSPX_phone_number": "42",
		"TSPX_second_phone_number": "43"
		@@ -3137,6 +3175,15 @@
		"A2DP/SNK/AVP",
		"A2DP/SRC/AVP"
		]
		},
		{
		"flags": [
		"leaudio_allow_leaudio_only_devices",
		"enable_hap_by_default"
		],
		"tests":[
		"HAP"
		]
		}
		]
		}