Snap for 12185670 from 10449993e532f50818ccc641d6e74b24fd370e00 to 24Q4-release (5833171b) · Commits · e / os / android_packages_modules_Bluetooth

android/pandora/server/configs/pts_bot_tests_config.json

+26 −21

Original line number	Diff line number	Diff line
		@@ -3,6 +3,18 @@
		"A2DP/SNK/AS/BV-01-I",
		"A2DP/SNK/AS/BV-03-I",
		"A2DP/SNK/AS/BV-04-I",
		"A2DP/SNK/AVP/BI-01-C",
		"A2DP/SNK/AVP/BI-02-C",
		"A2DP/SNK/AVP/BI-03-C",
		"A2DP/SNK/AVP/BI-06-C",
		"A2DP/SNK/AVP/BI-08-C",
		"A2DP/SNK/AVP/BI-10-C",
		"A2DP/SNK/AVP/BI-11-C",
		"A2DP/SNK/AVP/BI-12-C",
		"A2DP/SNK/AVP/BI-13-C",
		"A2DP/SNK/AVP/BI-14-C",
		"A2DP/SNK/AVP/BI-15-C",
		"A2DP/SNK/AVP/BI-16-C",
		"A2DP/SNK/AVP/BI-20-C",
		"A2DP/SNK/CC/BV-01-I",
		"A2DP/SNK/CC/BV-02-I",
		@@ -21,6 +33,14 @@
		"A2DP/SNK/SYN/BV-01-C",
		"A2DP/SRC/AS/BI-01-I",
		"A2DP/SRC/AS/BI-02-I",
		"A2DP/SRC/AVP/BI-10-C",
		"A2DP/SRC/AVP/BI-11-C",
		"A2DP/SRC/AVP/BI-12-C",
		"A2DP/SRC/AVP/BI-16-C",
		"A2DP/SRC/AVP/BI-17-C",
		"A2DP/SRC/AVP/BI-18-C",
		"A2DP/SRC/AVP/BI-20-C",
		"A2DP/SRC/AVP/BI-30-C",
		"A2DP/SRC/CC/BV-09-I",
		"A2DP/SRC/REL/BV-01-I",
		"A2DP/SRC/REL/BV-02-I",
		@@ -675,33 +695,13 @@
		"PAN/NAP/MISC/UUID/BV-02-C"
		],
		"skip": [
		"A2DP/SNK/AVP/BI-01-C",
		"A2DP/SNK/AVP/BI-02-C",
		"A2DP/SNK/AVP/BI-03-C",
		"A2DP/SNK/AVP/BI-06-C",
		"A2DP/SNK/AVP/BI-07-C",
		"A2DP/SNK/AVP/BI-08-C",
		"A2DP/SNK/AVP/BI-10-C",
		"A2DP/SNK/AVP/BI-11-C",
		"A2DP/SNK/AVP/BI-12-C",
		"A2DP/SNK/AVP/BI-13-C",
		"A2DP/SNK/AVP/BI-14-C",
		"A2DP/SNK/AVP/BI-15-C",
		"A2DP/SNK/AVP/BI-16-C",
		"A2DP/SNK/SET/BV-04-I",
		"A2DP/SNK/SET/BV-06-I",
		"A2DP/SNK/SUS/BV-02-I",
		"A2DP/SRC/AS/BV-01-I",
		"A2DP/SRC/AS/BV-03-I",
		"A2DP/SRC/AS/BV-04-I",
		"A2DP/SRC/AVP/BI-10-C",
		"A2DP/SRC/AVP/BI-11-C",
		"A2DP/SRC/AVP/BI-12-C",
		"A2DP/SRC/AVP/BI-16-C",
		"A2DP/SRC/AVP/BI-17-C",
		"A2DP/SRC/AVP/BI-18-C",
		"A2DP/SRC/AVP/BI-20-C",
		"A2DP/SRC/AVP/BI-30-C",
		"A2DP/SRC/CC/BV-10-I",
		"A2DP/SRC/SET/BV-05-I",
		"A2DP/SRC/SET/BV-06-I",
		@@ -3128,5 +3128,10 @@
		"SUM ICS": {},
		"VCP": {}
		},
		"flags": {}
		"flags": {
		"avdtp_error_codes": [
		"A2DP/SNK/AVP",
		"A2DP/SRC/AVP"
		]
		}
		}

build.py

+21 −1

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@ USE_DEFAULTS = {

		VALID_TARGETS = [
		'all', # All targets except test and clean
		'bloat', # Check bloat of crates
		'clean', # Clean up output directory
		'docs', # Build Rust docs
		'hosttools', # Build the host tools (i.e. packetgen)
		@@ -148,7 +149,7 @@ REQUIRED_APT_PACKAGES = [
		]

		# List of cargo packages required for linux build
		REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd', 'pdl-compiler']
		REQUIRED_CARGO_PACKAGES = ['cxxbridge-cmd', 'pdl-compiler', 'grpcio-compiler', 'cargo-bloat']

		APT_PKG_LIST = ['apt', '-qq', 'list']
		CARGO_PKG_LIST = ['cargo', 'install', '--list']
		@@ -249,6 +250,8 @@ class HostBuild():
		'link-arg=-Wl,--allow-multiple-definition',
		# exclude uninteresting warnings
		'-A improper_ctypes_definitions -A improper_ctypes -A unknown_lints',
		'-Cstrip=debuginfo',
		'-Copt-level=z',
		]

		return ' '.join(rust_flags)
		@@ -295,6 +298,10 @@ class HostBuild():
		if not env:
		env = self.env

		for k, v in env.items():
		if env[k] is None:
		env[k] = ""

		log_file = os.path.join(self.output_dir, '{}.log'.format(target))
		with open(log_file, 'wb') as lf:
		rc = 0
		@@ -566,6 +573,17 @@ class HostBuild():

		print('Tarball created at {}'.format(tar_location))

		def _target_bloat(self):
		"""Run cargo bloat on workspace.
		"""
		crate_paths = [
		os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'mgmt'),
		os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'service'),
		os.path.join(self.platform_dir, 'bt', 'system', 'gd', 'rust', 'linux', 'client')
		]
		for crate in crate_paths:
		self.run_command('bloat', ['cargo', 'bloat', '--release', '--crates', '--wide'], cwd=crate, env=self.env)

		def _target_clean(self):
		""" Delete the output directory entirely.
		"""
		@@ -620,6 +638,8 @@ class HostBuild():
		self._target_install()
		elif self.target == 'utils':
		self._target_utils()
		elif self.target == 'bloat':
		self._target_bloat()
		elif self.target == 'all':
		self._target_all()

flags/gap.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -249,3 +249,13 @@ flag {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "gatt_callback_on_failure"
		namespace: "bluetooth"
		description: "Invoke callbacks on early failure from the native stack"
		bug: "356550596"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

floss/build/Dockerfile

+5 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,11 @@ RUN /tmp/rustup.sh -y --default-toolchain 1.77.1
		ENV PATH="/root/.cargo/bin:${PATH}"

		# Install cargo packages required on build image.
		RUN cargo install --locked cxxbridge-cmd@1.0.94 pdl-compiler@0.1.1 grpcio-compiler@0.13.0
		RUN cargo install --locked \
		cxxbridge-cmd@1.0.94 \
		pdl-compiler@0.1.1 \
		grpcio-compiler@0.13.0 \
		cargo-bloat@0.12.1
		RUN cargo install --git https://android.googlesource.com/platform/build#8f9ca807 aconfig

		# Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't

framework/tests/bumble/src/android/bluetooth/hid/HidHostTest.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -236,21 +236,27 @@ public class HidHostTest {
		mFutureConnectionIntent = SettableFuture.create();

		mDevice = mBumble.getRemoteDevice();
		mFutureBondIntent = SettableFuture.create();
		assertThat(mDevice.createBond()).isTrue();
		assertThat(mFutureBondIntent.get()).isEqualTo(BluetoothDevice.BOND_BONDED);

		assertThat(mFutureConnectionIntent.get()).isEqualTo(BluetoothProfile.STATE_CONNECTED);
		if (mA2dpService != null) {
		if (mA2dpService != null
		&& mA2dpService.getConnectionPolicy(mDevice)
		== BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
		assertThat(
		mA2dpService.setConnectionPolicy(
		mDevice, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN))
		.isTrue();
		}
		if (mHfpService != null) {
		if (mHfpService != null
		&& mHfpService.getConnectionPolicy(mDevice)
		== BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
		assertThat(
		mHfpService.setConnectionPolicy(
		mDevice, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN))
		.isTrue();
		}
		assertThat(mFutureConnectionIntent.get()).isEqualTo(BluetoothProfile.STATE_CONNECTED);
		}

		@After