Merge changes I32dc8bbd,Ia5ef5c91,Ia1d6f2ea,Ie771d51e,I8ac3e196, ... into main... (3de6abd6) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_disc_legacy.cc

+2 −12

Original line number	Diff line number	Diff line
		@@ -843,11 +843,7 @@ static void bta_dm_search_cmpl() {

		std::vector<Uuid> gatt_services;

		bool send_gatt_results =
		bluetooth::common::init_flags::
		always_send_services_if_gatt_disc_done_is_enabled()
		? bta_dm_search_cb.gatt_disc_active
		: false;
		bool send_gatt_results = bta_dm_search_cb.gatt_disc_active;

		/* no BLE connection, i.e. Classic service discovery end */
		if (conn_id == GATT_INVALID_CONN_ID) {
		@@ -1039,13 +1035,7 @@ bool bta_dm_is_search_request_queued() {
		* Returns void
		*
		******************************************************************************/
		static void bta_dm_search_clear_queue() {
		bta_dm_search_cb.p_pending_search.reset();
		if (bluetooth::common::InitFlags::
		IsBtmDmFlushDiscoveryQueueOnSearchCancel()) {
		bta_dm_search_cb.pending_discovery_queue = {};
		}
		}
		static void bta_dm_search_clear_queue() { bta_dm_search_cb.p_pending_search.reset(); }

		/*******************************************************************************
		*

system/bta/hearing_aid/hearing_aid.cc

+5 −7

Original line number	Diff line number	Diff line
		@@ -270,9 +270,8 @@ class HearingAidImpl : public HearingAid {
		bool needs_parameter_update = false;
		std::chrono::time_point<std::chrono::steady_clock> last_drop_time_point =
		std::chrono::steady_clock::now();
		// at most 1 packet DROP per DROP_FREQUENCY_THRESHOLD seconds
		const int DROP_FREQUENCY_THRESHOLD =
		bluetooth::common::init_flags::get_asha_packet_drop_frequency_threshold();
		// at most 1 packet DROP per kDropFrequencyThreshold seconds
		static constexpr int64_t kDropFrequencyThreshold = 60;

		// Resampler context for audio stream.
		// Clock recovery uses L2CAP Flow Control Credit Ind acknowledgments
		@@ -450,9 +449,8 @@ class HearingAidImpl : public HearingAid {
		bool IsBelowDropFrequency(
		std::chrono::time_point<std::chrono::steady_clock> tp) {
		auto duration = tp - last_drop_time_point;
		bool droppable =
		std::chrono::duration_cast<std::chrono::seconds>(duration).count() >=
		DROP_FREQUENCY_THRESHOLD;
		bool droppable = std::chrono::duration_cast<std::chrono::seconds>(duration).count() >=
		kDropFrequencyThreshold;
		log::info("IsBelowDropFrequency {}", droppable);
		return droppable;
		}
		@@ -746,7 +744,7 @@ class HearingAidImpl : public HearingAid {
		if (tx_phys == PHY_LE_2M && rx_phys == PHY_LE_2M) {
		log::info("phy update to 2M successful: bd_addr={}",
		hearingDevice->address);
		hearingDevice->phy_update_retry_remain = PHY_UPDATE_RETRY_LIMIT;
		hearingDevice->phy_update_retry_remain = kPhyUpdateRetryLimit;
		return;
		}

system/bta/include/bta_hearing_aid_api.h

+7 −10

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		#include <functional>
		#include <vector>

		#include "common/init_flags.h"
		#include "stack/include/gap_api.h"
		#include "types/raw_address.h"

		@@ -41,8 +40,7 @@ constexpr uint8_t CAPABILITY_CSIS = 0x04;
		constexpr uint8_t CAPABILITY_RESERVED = 0xF8;

		// Number of retry for phy update. This targets to reduce phy update collision.
		const static uint8_t PHY_UPDATE_RETRY_LIMIT =
		bluetooth::common::init_flags::get_asha_phy_update_retry_limit();
		const static uint8_t kPhyUpdateRetryLimit = 5;

		/** Implementations of HearingAid will also implement this interface */
		class HearingAidAudioReceiver {
		@@ -169,11 +167,10 @@ struct HearingDevice {

		int phy_update_retry_remain;

		HearingDevice(const RawAddress& address, uint8_t capabilities,
		uint16_t codecs, uint16_t audio_control_point_handle,
		uint16_t audio_status_handle, uint16_t audio_status_ccc_handle,
		uint16_t service_changed_ccc_handle, uint16_t volume_handle,
		uint16_t read_psm_handle, uint64_t hiSyncId,
		HearingDevice(const RawAddress& address, uint8_t capabilities, uint16_t codecs,
		uint16_t audio_control_point_handle, uint16_t audio_status_handle,
		uint16_t audio_status_ccc_handle, uint16_t service_changed_ccc_handle,
		uint16_t volume_handle, uint16_t read_psm_handle, uint64_t hiSyncId,
		uint16_t render_delay, uint16_t preparation_delay)
		: address(address),
		first_connection(false),
		@@ -199,7 +196,7 @@ struct HearingDevice {
		command_acked(false),
		read_rssi_count(0),
		gap_opened(false),
		phy_update_retry_remain(PHY_UPDATE_RETRY_LIMIT) {}
		phy_update_retry_remain(kPhyUpdateRetryLimit) {}

		HearingDevice(const RawAddress& address, bool first_connection)
		: address(address),
		@@ -224,7 +221,7 @@ struct HearingDevice {
		command_acked(false),
		read_rssi_count(0),
		gap_opened(false),
		phy_update_retry_remain(PHY_UPDATE_RETRY_LIMIT) {}
		phy_update_retry_remain(kPhyUpdateRetryLimit) {}

		HearingDevice() : HearingDevice(RawAddress::kEmpty, false) {}

system/gd/common/init_flags.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -34,10 +34,6 @@ class InitFlags final {
		init_flags::load(std::move(rusted_flags));
		}

		inline static bool IsBtmDmFlushDiscoveryQueueOnSearchCancel() {
		return init_flags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled();
		}

		inline static bool IsTargetedAnnouncementReconnectionMode() {
		return init_flags::leaudio_targeted_announcement_reconnection_mode_is_enabled();
		}

system/gd/common/init_flags_test.cc

+0 −6

Original line number	Diff line number	Diff line
		@@ -22,12 +22,6 @@

		using bluetooth::common::InitFlags;

		TEST(InitFlagsTest, test_enable_btm_flush_discovery_queue_on_search_cancel) {
		const char* input[] = {"INIT_btm_dm_flush_discovery_queue_on_search_cancel=true", nullptr};
		InitFlags::Load(input);
		ASSERT_TRUE(InitFlags::IsBtmDmFlushDiscoveryQueueOnSearchCancel());
		}

		TEST(InitFlagsTest, test_leaudio_targeted_announcement_reconnection_mode) {
		const char* input[] = {"INIT_leaudio_targeted_announcement_reconnection_mode=true", nullptr};
		InitFlags::Load(input);