Merge "[Invisalign2] Remove duplicate logic in the following APIs" into main (901a429a) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/smp/smp_api.cc

+1 −16

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@
		#include "l2cdefs.h"
		#include "os/log.h"
		#include "smp_int.h"
		#include "stack/btm/btm_dev.h"
		#include "stack/include/bt_octets.h"
		#include "stack/include/btm_sec_api_types.h"
		#include "types/raw_address.h"

		/*******************************************************************************
		@@ -294,11 +294,6 @@ void SMP_PasskeyReply(const RawAddress& bd_addr, uint8_t res,
		return;
		}

		if (btm_find_dev(bd_addr) == NULL) {
		LOG_ERROR("no dev CB");
		return;
		}

		if (passkey > BTM_MAX_PASSKEY_VAL \|\| res != SMP_SUCCESS) {
		LOG_WARN("Wrong key len:%d or passkey entry fail", passkey);
		/* send pairing failure */
		@@ -346,11 +341,6 @@ void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res) {
		return;
		}

		if (btm_find_dev(bd_addr) == NULL) {
		LOG_ERROR("no dev CB");
		return;
		}

		if (res != SMP_SUCCESS) {
		LOG_WARN("Numeric Comparison fails");
		/* send pairing failure */
		@@ -527,11 +517,6 @@ void SMP_SirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res) {
		return;
		}

		if (btm_find_dev(bd_addr) == NULL) {
		LOG_ERROR("No dev CB");
		return;
		}

		tSMP_INT_DATA smp_int_data;
		if (res != SMP_SUCCESS) {
		LOG_WARN("Verification fails");