From b989f634087b35dc89c58217aab11a46b93c8673 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 29 Oct 2020 20:58:53 -0700 Subject: [PATCH] Clean up check_sdp_bl Some variables are unused or overriden Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: I3d9f24273d03540c9218e7ce61e6633d020eaba3 --- btif/src/btif_dm.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index eeae3f2ad..acc444f1a 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -404,17 +404,11 @@ bool check_cod_hid(const RawAddress* remote_bdaddr) { * ******************************************************************************/ bool check_sdp_bl(const RawAddress* remote_bdaddr) { - uint16_t manufacturer = 0; - uint8_t lmp_ver = 0; - uint16_t lmp_subver = 0; bt_property_t prop_name; bt_remote_version_t info; if (remote_bdaddr == NULL) return false; - /* fetch additional info about remote device used in iop query */ - BTM_ReadRemoteVersion(*remote_bdaddr, &lmp_ver, &manufacturer, &lmp_subver); - /* if not available yet, try fetching from config database */ BTIF_STORAGE_FILL_PROPERTY(&prop_name, BT_PROPERTY_REMOTE_VERSION_INFO, sizeof(bt_remote_version_t), &info); @@ -423,7 +417,7 @@ bool check_sdp_bl(const RawAddress* remote_bdaddr) { BT_STATUS_SUCCESS) { return false; } - manufacturer = info.manufacturer; + uint16_t manufacturer = info.manufacturer; for (unsigned int i = 0; i < ARRAY_SIZE(sdp_blacklist); i++) { if (manufacturer == sdp_blacklist[i].manufact_id) return true; -- 2.11.0