Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master." (5933b4ca) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/hearing_aid/hearing_aid.cc

+0 −2

Original line number	Diff line number	Diff line
		@@ -1438,8 +1438,6 @@ class HearingAidImpl : public HearingAid {
		<< ", playback_started=" << hearingDevice->playback_started
		<< ", accepting_audio=" << hearingDevice->accepting_audio;

		hearingDevice->playback_started = false;

		if (hearingDevice->connecting_actively) {
		// cancel pending direct connect
		BTA_GATTC_CancelOpen(gatt_if, address, true);

+26 −0

Original line number	Diff line number	Diff line
		@@ -908,6 +908,15 @@ void smp_proc_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
		uint8_t* p = p_data->p_data;

		SMP_TRACE_DEBUG("%s", __func__);

		if (smp_command_has_invalid_parameters(p_cb)) {
		tSMP_INT_DATA smp_int_data;
		smp_int_data.status = SMP_INVALID_PARAMETERS;
		android_errorWriteLog(0x534e4554, "111937065");
		smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
		return;
		}

		STREAM_TO_ARRAY(p_cb->ltk.data(), p, OCTET16_LEN);

		smp_key_distribution(p_cb, NULL);
		@@ -919,6 +928,14 @@ void smp_proc_master_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
		tBTM_LE_KEY_VALUE le_key;

		SMP_TRACE_DEBUG("%s", __func__);

		if (p_cb->rcvd_cmd_len < 11) { // 1(Code) + 2(EDIV) + 8(Rand)
		android_errorWriteLog(0x534e4554, "111937027");
		SMP_TRACE_ERROR("%s: Invalid command length: %d, should be at least 11",
		__func__, p_cb->rcvd_cmd_len);
		return;
		}

		smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ENC, true);

		STREAM_TO_UINT16(le_key.penc_key.ediv, p);
		@@ -941,6 +958,15 @@ void smp_proc_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
		uint8_t* p = p_data->p_data;

		SMP_TRACE_DEBUG("%s", __func__);

		if (smp_command_has_invalid_parameters(p_cb)) {
		tSMP_INT_DATA smp_int_data;
		smp_int_data.status = SMP_INVALID_PARAMETERS;
		android_errorWriteLog(0x534e4554, "111937065");
		smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
		return;
		}

		STREAM_TO_ARRAY(p_cb->tk.data(), p, OCTET16_LEN); /* reuse TK for IRK */
		smp_key_distribution_by_transport(p_cb, NULL);
		}