Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a256b0b authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Clean up check_sdp_bl am: 2394322a am: eeffc0ea am: 5ba908ea 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1480890

Change-Id: I8406c66ac18cd9502b8ce7960354438a7d9b17db
parents 56b3f535 5ba908ea

system/btif/src/btif_dm.cc

+1 −7
Original line number Diff line number Diff line
@@ -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;