Snap for 8637453 from 312bec5f72b66cb1a68891e0bb5b909b4f1f5d4c to tm-qpr1-release (ab66d1fa) · Commits · e / os / android_packages_modules_Bluetooth

android/app/res/values-kn/strings.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -125,9 +125,9 @@
	<string name="bluetooth_map_settings_app_icon" msgid="3501432663809664982">"ಅಪ್ಲಿಕೇಶನ್‌ ಐಕಾನ್‌"</string>		<string name="bluetooth_map_settings_app_icon" msgid="3501432663809664982">"ಅಪ್ಲಿಕೇಶನ್‌ ಐಕಾನ್‌"</string>
	<string name="bluetooth_map_settings_title" msgid="4226030082708590023">"ಬ್ಲೂಟೂತ್ ಸಂದೇಶ ಹಂಚಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>		<string name="bluetooth_map_settings_title" msgid="4226030082708590023">"ಬ್ಲೂಟೂತ್ ಸಂದೇಶ ಹಂಚಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
	<string name="bluetooth_map_settings_no_account_slots_left" msgid="755024228476065757">"ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. 0 ಸ್ಲಾಟ್‌ಗಳು ಉಳಿದಿವೆ"</string>		<string name="bluetooth_map_settings_no_account_slots_left" msgid="755024228476065757">"ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. 0 ಸ್ಲಾಟ್‌ಗಳು ಉಳಿದಿವೆ"</string>
	<string name="bluetooth_connected" msgid="5687474377090799447">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>		<string name="bluetooth_connected" msgid="5687474377090799447">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೋ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
	<string name="bluetooth_disconnected" msgid="6841396291728343534">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"</string>		<string name="bluetooth_disconnected" msgid="6841396291728343534">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೋ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ"</string>
	<string name="a2dp_sink_mbs_label" msgid="6035366346569127155">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೊ"</string>		<string name="a2dp_sink_mbs_label" msgid="6035366346569127155">"ಬ್ಲೂಟೂತ್‌ ಆಡಿಯೋ"</string>
	<string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"4GB ಗಿಂತ ದೊಡ್ಡದಾದ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>		<string name="bluetooth_opp_file_limit_exceeded" msgid="6612109860149473930">"4GB ಗಿಂತ ದೊಡ್ಡದಾದ ಫೈಲ್‌ಗಳನ್ನು ವರ್ಗಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
	<string name="bluetooth_connect_action" msgid="2319449093046720209">"ಬ್ಲೂಟೂತ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>		<string name="bluetooth_connect_action" msgid="2319449093046720209">"ಬ್ಲೂಟೂತ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
	</resources>		</resources>

system/audio_a2dp_hw/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,10 @@ cc_library_static {
	cc_test {		cc_test {
	name: "net_test_audio_a2dp_hw",		name: "net_test_audio_a2dp_hw",
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	defaults: ["audio_a2dp_hw_defaults"],		defaults: [
			"audio_a2dp_hw_defaults",
			"mts_defaults",
			],
	srcs: [		srcs: [
	"test/audio_a2dp_hw_test.cc",		"test/audio_a2dp_hw_test.cc",
	],		],

system/audio_hearing_aid_hw/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,10 @@ cc_library {
	cc_test {		cc_test {
	name: "net_test_audio_hearing_aid_hw",		name: "net_test_audio_hearing_aid_hw",
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	defaults: ["audio_hearing_aid_hw_defaults"],		defaults: [
			"audio_hearing_aid_hw_defaults",
			"mts_defaults",
			],
	srcs: [		srcs: [
	"test/audio_hearing_aid_hw_test.cc",		"test/audio_hearing_aid_hw_test.cc",
	],		],

system/bta/Android.bp

+24 −3

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,7 @@ cc_library_static {
	"le_audio/le_audio_set_configuration_provider.cc",		"le_audio/le_audio_set_configuration_provider.cc",
	"le_audio/le_audio_set_configuration_provider_json.cc",		"le_audio/le_audio_set_configuration_provider_json.cc",
	"le_audio/le_audio_types.cc",		"le_audio/le_audio_types.cc",
			"le_audio/metrics_collector.cc",
	"has/has_client.cc",		"has/has_client.cc",
	"has/has_ctp.cc",		"has/has_ctp.cc",
	"has/has_journal.cc",		"has/has_journal.cc",
	@@ -153,7 +154,10 @@ cc_library_static {
	// bta unit tests for target		// bta unit tests for target
	cc_test {		cc_test {
	name: "net_test_bta",		name: "net_test_bta",
	defaults: ["fluoride_bta_defaults"],		defaults: [
			"fluoride_bta_defaults",
			"mts_defaults"
			],
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	srcs: [		srcs: [
	":TestMockStackBtm",		":TestMockStackBtm",
	@@ -192,7 +196,10 @@ cc_test {

	cc_test {		cc_test {
	name: "bt_host_test_bta",		name: "bt_host_test_bta",
	defaults: ["fluoride_bta_defaults"],		defaults: [
			"fluoride_bta_defaults",
			"mts_defaults",
			],
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -266,7 +273,10 @@ cc_test {
	// bta hf client add record tests for target		// bta hf client add record tests for target
	cc_test {		cc_test {
	name: "net_test_hf_client_add_record",		name: "net_test_hf_client_add_record",
	defaults: ["fluoride_defaults"],		defaults: [
			"fluoride_defaults",
			"mts_defaults",
			],
	test_suites: ["device-tests"],		test_suites: ["device-tests"],
	include_dirs: [		include_dirs: [
	"packages/modules/Bluetooth/system",		"packages/modules/Bluetooth/system",
	@@ -300,6 +310,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -353,6 +364,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -394,6 +406,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -512,6 +525,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_defaults",		"fluoride_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	target: {		target: {
	@@ -550,6 +564,7 @@ cc_test {
	"le_audio/le_audio_set_configuration_provider_json.cc",		"le_audio/le_audio_set_configuration_provider_json.cc",
	"le_audio/le_audio_types.cc",		"le_audio/le_audio_types.cc",
	"le_audio/le_audio_types_test.cc",		"le_audio/le_audio_types_test.cc",
			"le_audio/metrics_collector_linux.cc",
	"le_audio/mock_iso_manager.cc",		"le_audio/mock_iso_manager.cc",
	"test/common/mock_controller.cc",		"test/common/mock_controller.cc",
	"le_audio/state_machine.cc",		"le_audio/state_machine.cc",
	@@ -591,6 +606,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -611,6 +627,8 @@ cc_test {
	"le_audio/le_audio_client_test.cc",		"le_audio/le_audio_client_test.cc",
	"le_audio/le_audio_set_configuration_provider_json.cc",		"le_audio/le_audio_set_configuration_provider_json.cc",
	"le_audio/le_audio_types.cc",		"le_audio/le_audio_types.cc",
			"le_audio/metrics_collector.cc",
			"le_audio/metrics_collector_test.cc",
	"le_audio/mock_iso_manager.cc",		"le_audio/mock_iso_manager.cc",
	"le_audio/mock_state_machine.cc",		"le_audio/mock_state_machine.cc",
	"test/common/btm_api_mock.cc",		"test/common/btm_api_mock.cc",
	@@ -677,6 +695,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -724,6 +743,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [
	@@ -791,6 +811,7 @@ cc_test {
	defaults: [		defaults: [
	"fluoride_bta_defaults",		"fluoride_bta_defaults",
	"clang_coverage_bin",		"clang_coverage_bin",
			"mts_defaults",
	],		],
	host_supported: true,		host_supported: true,
	include_dirs: [		include_dirs: [

system/bta/le_audio/client.cc

+30 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@
	#include "gd/common/strings.h"		#include "gd/common/strings.h"
	#include "le_audio_set_configuration_provider.h"		#include "le_audio_set_configuration_provider.h"
	#include "le_audio_types.h"		#include "le_audio_types.h"
			#include "metrics_collector.h"
	#include "osi/include/log.h"		#include "osi/include/log.h"
	#include "osi/include/osi.h"		#include "osi/include/osi.h"
	#include "osi/include/properties.h"		#include "osi/include/properties.h"
	@@ -880,6 +881,10 @@ class LeAudioClientImpl : public LeAudioClient {
	leAudioDevices_.Add(address, true);		leAudioDevices_.Add(address, true);
	} else {		} else {
	leAudioDevice->connecting_actively_ = true;		leAudioDevice->connecting_actively_ = true;

			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, address, ConnectionState::CONNECTING,
			le_audio::ConnectionStatus::SUCCESS);
	}		}

	BTA_GATTC_Open(gatt_if_, address, true, false);		BTA_GATTC_Open(gatt_if_, address, true, false);
	@@ -1253,6 +1258,9 @@ class LeAudioClientImpl : public LeAudioClient {
	LOG(ERROR) << "Failed to connect to LeAudio leAudioDevice, status: "		LOG(ERROR) << "Failed to connect to LeAudio leAudioDevice, status: "
	<< +status;		<< +status;
	callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address);		callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address);
			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, address, ConnectionState::CONNECTED,
			le_audio::ConnectionStatus::FAILED);
	return;		return;
	}		}

	@@ -1303,6 +1311,9 @@ class LeAudioClientImpl : public LeAudioClient {
	}		}

	LOG(ERROR) << __func__ << " Encryption error";		LOG(ERROR) << __func__ << " Encryption error";
			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, address, ConnectionState::CONNECTED,
			le_audio::ConnectionStatus::FAILED);
	}		}

	void RegisterKnownNotifications(LeAudioDevice* leAudioDevice) {		void RegisterKnownNotifications(LeAudioDevice* leAudioDevice) {
	@@ -1358,6 +1369,9 @@ class LeAudioClientImpl : public LeAudioClient {
	BTA_GATTC_Close(leAudioDevice->conn_id_);		BTA_GATTC_Close(leAudioDevice->conn_id_);
	if (leAudioDevice->connecting_actively_) {		if (leAudioDevice->connecting_actively_) {
	callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address);		callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address);
			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, address, ConnectionState::CONNECTED,
			le_audio::ConnectionStatus::FAILED);
	}		}
	return;		return;
	}		}
	@@ -1402,6 +1416,10 @@ class LeAudioClientImpl : public LeAudioClient {
	leAudioDevice->closing_stream_for_disconnection_ = false;		leAudioDevice->closing_stream_for_disconnection_ = false;
	leAudioDevice->encrypted_ = false;		leAudioDevice->encrypted_ = false;

			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, address, ConnectionState::DISCONNECTED,
			le_audio::ConnectionStatus::SUCCESS);

	if (leAudioDevice->removing_device_) {		if (leAudioDevice->removing_device_) {
	if (leAudioDevice->group_id_ != bluetooth::groups::kGroupUnknown) {		if (leAudioDevice->group_id_ != bluetooth::groups::kGroupUnknown) {
	auto group = aseGroups_.FindById(leAudioDevice->group_id_);		auto group = aseGroups_.FindById(leAudioDevice->group_id_);
	@@ -1953,6 +1971,9 @@ class LeAudioClientImpl : public LeAudioClient {
	btif_storage_set_leaudio_autoconnect(leAudioDevice->address_, true);		btif_storage_set_leaudio_autoconnect(leAudioDevice->address_, true);
	leAudioDevice->first_connection_ = false;		leAudioDevice->first_connection_ = false;
	}		}
			le_audio::MetricsCollector::Get()->OnConnectionStateChanged(
			leAudioDevice->group_id_, leAudioDevice->address_,
			ConnectionState::CONNECTED, le_audio::ConnectionStatus::SUCCESS);
	}		}

	bool IsAseAcceptingAudioData(struct ase* ase) {		bool IsAseAcceptingAudioData(struct ase* ase) {
	@@ -2799,8 +2820,10 @@ class LeAudioClientImpl : public LeAudioClient {

	/* Last suspends group - triggers group stop */		/* Last suspends group - triggers group stop */
	if ((audio_receiver_state_ == AudioState::IDLE) \|\|		if ((audio_receiver_state_ == AudioState::IDLE) \|\|
	(audio_receiver_state_ == AudioState::READY_TO_RELEASE))		(audio_receiver_state_ == AudioState::READY_TO_RELEASE)) {
	OnAudioSuspend();		OnAudioSuspend();
			le_audio::MetricsCollector::Get()->OnStreamEnded(active_group_id_);
			}

	DLOG(INFO) << __func__		DLOG(INFO) << __func__
	<< " OUT: audio_receiver_state_: " << audio_receiver_state_		<< " OUT: audio_receiver_state_: " << audio_receiver_state_
	@@ -2898,6 +2921,8 @@ class LeAudioClientImpl : public LeAudioClient {
	if (alarm_is_scheduled(suspend_timeout_))		if (alarm_is_scheduled(suspend_timeout_))
	alarm_cancel(suspend_timeout_);		alarm_cancel(suspend_timeout_);
	leAudioClientAudioSource->ConfirmStreamingRequest();		leAudioClientAudioSource->ConfirmStreamingRequest();
			le_audio::MetricsCollector::Get()->OnStreamStarted(
			active_group_id_, current_context_type_);
	break;		break;
	case AudioState::RELEASING:		case AudioState::RELEASING:
	/* Keep wainting. After release is done, Audio Hal will be notified		/* Keep wainting. After release is done, Audio Hal will be notified
	@@ -3443,6 +3468,8 @@ class LeAudioClientImpl : public LeAudioClient {

	stream_setup_end_timestamp_ =		stream_setup_end_timestamp_ =
	bluetooth::common::time_get_os_boottime_us();		bluetooth::common::time_get_os_boottime_us();
			le_audio::MetricsCollector::Get()->OnStreamStarted(
			active_group_id_, current_context_type_);
	break;		break;
	case GroupStreamStatus::SUSPENDED:		case GroupStreamStatus::SUSPENDED:
	stream_setup_end_timestamp_ = 0;		stream_setup_end_timestamp_ = 0;
	@@ -3575,6 +3602,7 @@ class LeAudioClientImpl : public LeAudioClient {
	leAudioClientAudioSink->Release(audio_sink_instance_);		leAudioClientAudioSink->Release(audio_sink_instance_);
	audio_sink_instance_ = nullptr;		audio_sink_instance_ = nullptr;
	}		}
			le_audio::MetricsCollector::Get()->OnStreamEnded(active_group_id_);
	}		}
	};		};

	@@ -3855,6 +3883,7 @@ void LeAudioClient::Cleanup(base::Callback<void()> cleanupCb) {
	CodecManager::GetInstance()->Stop();		CodecManager::GetInstance()->Stop();
	LeAudioGroupStateMachine::Cleanup();		LeAudioGroupStateMachine::Cleanup();
	IsoManager::GetInstance()->Stop();		IsoManager::GetInstance()->Stop();
			le_audio::MetricsCollector::Get()->Flush();
	}		}

	void LeAudioClient::InitializeAudioClients(		void LeAudioClient::InitializeAudioClients(