Merge "leaudio: Fix the MTU exchange request" into tm-qpr-dev (a5b81451) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/client.cc

+23 −5

Original line number	Diff line number	Diff line
		@@ -1207,6 +1207,7 @@ class LeAudioClientImpl : public LeAudioClient {
		BtaGattQueue::Clean(leAudioDevice->conn_id_);
		BTA_GATTC_Close(leAudioDevice->conn_id_);
		leAudioDevice->conn_id_ = GATT_INVALID_CONN_ID;
		leAudioDevice->mtu_ = 0;
		}

		void DeregisterNotifications(LeAudioDevice* leAudioDevice) {
		@@ -1527,11 +1528,7 @@ class LeAudioClientImpl : public LeAudioClient {

		leAudioDevice->connecting_actively_ = false;
		leAudioDevice->conn_id_ = conn_id;

		if (mtu == GATT_DEF_BLE_MTU_SIZE) {
		LOG(INFO) << __func__ << ", Configure MTU";
		BtaGattQueue::ConfigureMtu(leAudioDevice->conn_id_, 240);
		}
		leAudioDevice->mtu_ = mtu;

		if (BTM_SecIsSecurityPending(address)) {
		/* if security collision happened, wait for encryption done
		@@ -1610,6 +1607,13 @@ class LeAudioClientImpl : public LeAudioClient {
		leAudioDevice->address_, ase.hdls);
		}

		void changeMtuIfPossible(LeAudioDevice* leAudioDevice) {
		if (leAudioDevice->mtu_ == GATT_DEF_BLE_MTU_SIZE) {
		LOG(INFO) << __func__ << ", Configure MTU";
		BtaGattQueue::ConfigureMtu(leAudioDevice->conn_id_, GATT_MAX_MTU_SIZE);
		}
		}

		void OnEncryptionComplete(const RawAddress& address, uint8_t status) {
		LOG(INFO) << __func__ << " " << address << "status: " << int{status};

		@@ -1632,6 +1636,8 @@ class LeAudioClientImpl : public LeAudioClient {
		return;
		}

		changeMtuIfPossible(leAudioDevice);

		/* If we know services, register for notifications */
		if (leAudioDevice->known_service_handles_)
		RegisterKnownNotifications(leAudioDevice);
		@@ -1673,6 +1679,7 @@ class LeAudioClientImpl : public LeAudioClient {

		callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address);
		leAudioDevice->conn_id_ = GATT_INVALID_CONN_ID;
		leAudioDevice->mtu_ = 0;
		leAudioDevice->closing_stream_for_disconnection_ = false;
		leAudioDevice->encrypted_ = false;

		@@ -1750,6 +1757,16 @@ class LeAudioClientImpl : public LeAudioClient {
		DeregisterNotifications(leAudioDevice);
		}

		void OnMtuChanged(uint16_t conn_id, uint16_t mtu) {
		LeAudioDevice* leAudioDevice = leAudioDevices_.FindByConnId(conn_id);
		if (!leAudioDevice) {
		LOG_DEBUG("Unknown connectect id %d", conn_id);
		return;
		}

		leAudioDevice->mtu_ = mtu;
		}

		void OnGattServiceDiscoveryDone(const RawAddress& address) {
		LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address);
		if (!leAudioDevice) {
		@@ -3997,6 +4014,7 @@ void le_audio_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {
		instance->OnServiceChangeEvent(p_data->remote_bda);
		break;
		case BTA_GATTC_CFG_MTU_EVT:
		instance->OnMtuChanged(p_data->cfg_mtu.conn_id, p_data->cfg_mtu.mtu);
		break;

		default:

system/bta/le_audio/devices.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ class LeAudioDevice {
		bool connecting_actively_;
		bool closing_stream_for_disconnection_;
		uint16_t conn_id_;
		uint16_t mtu_;
		bool encrypted_;
		int group_id_;
		bool csis_member_;
		@@ -93,6 +94,7 @@ class LeAudioDevice {
		connecting_actively_(first_connection),
		closing_stream_for_disconnection_(false),
		conn_id_(GATT_INVALID_CONN_ID),
		mtu_(0),
		encrypted_(false),
		group_id_(group_id),
		csis_member_(false),