Snap for 7269314 from bc8e0d20b6e92b244a57059e3a517a77acca9065 to sc-release (65b37eaf) · Commits · e / os / android_packages_modules_Bluetooth

.gitignore

+4 −1

Original line number	Diff line number	Diff line
		buildtools
		out
		third_party
		third_party/
		target/
		Cargo.lock
		tags

OWNERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,10 +3,11 @@ set noparent
		# Project owners
		zachoverflow@google.com
		cmanton@google.com
		cncn@google.com
		hsz@google.com
		jpawlowski@google.com
		mylesgw@google.com
		optedoblivion@google.com
		qasimj@google.com
		rahulsabnis@google.com
		siyuanh@google.com
		stng@google.com

build.py

+12 −4

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ class HostBuild():
		self._gn_default_output(),
		]

		if 'PKG_CONFIG_PATH' in self.env:
		print('DEBUG: PKG_CONFIG_PATH is', self.env['PKG_CONFIG_PATH'])

		self.run_command('configure', gn_args)
		@@ -317,6 +318,8 @@ class HostBuild():
		replace-with = "systembt"
		local-registry = "/nonexistent"
		"""

		if self.args.vendored_rust:
		contents = template.format(self.platform_dir)
		with open(os.path.join(self.env['CARGO_HOME'], 'config'), 'w') as f:
		f.write(contents)
		@@ -348,6 +351,10 @@ class HostBuild():
		""" Build rust artifacts in an already prepared environment.
		"""
		self._rust_build()
		rust_dir = os.path.join(self._gn_default_output(), 'rust')
		if os.path.exists(rust_dir):
		shutil.rmtree(rust_dir)
		shutil.copytree(os.path.join(self.output_dir, 'debug'), rust_dir)

		def _target_main(self):
		""" Build the main GN artifacts in an already prepared environment.
		@@ -406,6 +413,7 @@ if __name__ == '__main__':
		parser.add_argument('--libdir', help='Libdir - default = usr/lib64', default='usr/lib64')
		parser.add_argument('--use-board', help='Use a built x86 board for dependencies. Provide path.')
		parser.add_argument('--jobs', help='Number of jobs to run', default=0, type=int)
		parser.add_argument('--vendored-rust', help='Use vendored rust crates', default=False, action="store_true")
		parser.add_argument('--verbose', help='Verbose logs for build.')

		args = parser.parse_args()

system/audio_hal_interface/client_interface.cc

+7 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@
		#include <hidl/MQDescriptor.h>
		#include <future>

		#include "common/stop_watch_legacy.h"
		#include "osi/include/log.h"

		namespace bluetooth {
		@@ -34,6 +35,7 @@ using ::android::hardware::Return;
		using ::android::hardware::Void;
		using ::android::hardware::audio::common::V5_0::SourceMetadata;
		using ::android::hardware::bluetooth::audio::V2_0::IBluetoothAudioPort;
		using ::bluetooth::common::StopWatchLegacy;

		using DataMQ = ::android::hardware::MessageQueue<
		uint8_t, ::android::hardware::kSynchronizedReadWrite>;
		@@ -72,6 +74,7 @@ class BluetoothAudioPortImpl : public IBluetoothAudioPort {
		: transport_instance_(transport_instance), provider_(provider) {}

		Return<void> startStream() override {
		StopWatchLegacy(__func__);
		BluetoothAudioCtrlAck ack = transport_instance_->StartRequest();
		if (ack != BluetoothAudioCtrlAck::PENDING) {
		auto hidl_retval =
		@@ -85,6 +88,7 @@ class BluetoothAudioPortImpl : public IBluetoothAudioPort {
		}

		Return<void> suspendStream() override {
		StopWatchLegacy(__func__);
		BluetoothAudioCtrlAck ack = transport_instance_->SuspendRequest();
		if (ack != BluetoothAudioCtrlAck::PENDING) {
		auto hidl_retval =
		@@ -98,12 +102,14 @@ class BluetoothAudioPortImpl : public IBluetoothAudioPort {
		}

		Return<void> stopStream() override {
		StopWatchLegacy(__func__);
		transport_instance_->StopRequest();
		return Void();
		}

		Return<void> getPresentationPosition(
		getPresentationPosition_cb _hidl_cb) override {
		StopWatchLegacy(__func__);
		uint64_t remote_delay_report_ns;
		uint64_t total_bytes_read;
		timespec data_position;
		@@ -130,6 +136,7 @@ class BluetoothAudioPortImpl : public IBluetoothAudioPort {
		}

		Return<void> updateMetadata(const SourceMetadata& sourceMetadata) override {
		StopWatchLegacy(__func__);
		LOG(INFO) << __func__ << ": " << sourceMetadata.tracks.size()
		<< " track(s)";
		// refer to StreamOut.impl.h within Audio HAL (AUDIO_HAL_VERSION_5_0)

system/common/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_library_static {
		"os_utils.cc",
		"repeating_timer.cc",
		"time_util.cc",
		"stop_watch_legacy.cc",
		],
		shared_libs: [
		"libcrypto",