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

Commit 2aa065dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use updated SIG wording: blacklist to rejectlist" am: 20a72551 am:... 

Merge "Use updated SIG wording: blacklist to rejectlist" am: 20a72551 am: 592ed3ea am: 4eb774bc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e023cb28905ac899cb9e5bf486b87a32d9c2d96
parents e7937e19 4eb774bc

system/bta/av/bta_av_aact.cc

+1 −1
Original line number Diff line number Diff line
@@ -2720,7 +2720,7 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  APPL_TRACE_DEBUG("%s: err_code = %d", __func__, err_code);



  // Disable AVDTP RECONFIGURE for blacklisted devices

  // Disable AVDTP RECONFIGURE for rejectlisted devices

  bool disable_avdtp_reconfigure = false;

  {

    char remote_name[BTM_MAX_REM_BD_NAME_LEN] = "";

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2615,7 +2615,7 @@ static void bta_dm_adjust_roles(bool delay_role_switch) { 
            setup and

            causing encryption (and in turn the link) to fail .  These device .

            Firmware

            versions are stored in a blacklist and role switch with these

            versions are stored in a rejectlist and role switch with these

            devices are

            delayed to avoid the collision with link encryption setup */

system/bta/hf_client/bta_hf_client_at.cc

+19 −18
Original line number Diff line number Diff line
@@ -1410,12 +1410,13 @@ static char* bta_hf_client_parse_no_answer(tBTA_HF_CLIENT_CB* client_cb, 
  return buffer;

}



static char* bta_hf_client_parse_blacklisted(tBTA_HF_CLIENT_CB* client_cb,

static char* bta_hf_client_parse_rejectlisted(tBTA_HF_CLIENT_CB* client_cb,

                                              char* buffer) {

  AT_CHECK_EVENT(buffer, "BLACKLISTED");

  AT_CHECK_EVENT(buffer, "REJECTLISTED");

  AT_CHECK_RN(buffer);



  bta_hf_client_handle_error(client_cb, BTA_HF_CLIENT_AT_RESULT_BLACKLISTED, 0);

  bta_hf_client_handle_error(client_cb, BTA_HF_CLIENT_AT_RESULT_REJECTLISTED,

                             0);



  return buffer;

}
@@ -1500,7 +1501,7 @@ static const tBTA_HF_CLIENT_PARSER_CALLBACK bta_hf_client_parser_cb[] = { 
    bta_hf_client_parse_cnum,         bta_hf_client_parse_btrh,

    bta_hf_client_parse_busy,         bta_hf_client_parse_delayed,

    bta_hf_client_parse_no_carrier,   bta_hf_client_parse_no_answer,

    bta_hf_client_parse_blacklisted, bta_hf_client_process_unknown};

    bta_hf_client_parse_rejectlisted, bta_hf_client_process_unknown};



/* calculate supported event list length */

static const uint16_t bta_hf_client_parser_cb_count =

system/bta/include/bta_hf_client_api.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ typedef uint16_t tBTA_HF_CLIENT_CHLD_FEAT; 
#define BTA_HF_CLIENT_AT_RESULT_BUSY 3

#define BTA_HF_CLIENT_AT_RESULT_NO_ANSWER 4

#define BTA_HF_CLIENT_AT_RESULT_DELAY 5

#define BTA_HF_CLIENT_AT_RESULT_BLACKLISTED 6

#define BTA_HF_CLIENT_AT_RESULT_REJECTLISTED 6

#define BTA_HF_CLIENT_AT_RESULT_CME 7



typedef uint8_t tBTA_HF_CLIENT_AT_RESULT_TYPE;

system/btif/src/btif_dm.cc

+5 −5
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ typedef struct { 


#define MAX_BTIF_BOND_EVENT_ENTRIES 15



static skip_sdp_entry_t sdp_blacklist[] = {{76}};  // Apple Mouse and Keyboard

static skip_sdp_entry_t sdp_rejectlist[] = {{76}};  // Apple Mouse and Keyboard



/* This flag will be true if HCI_Inquiry is in progress */

static bool btif_dm_inquiry_in_progress = false;
@@ -395,11 +395,11 @@ bool check_cod_hid(const RawAddress* remote_bdaddr) { 
 *

 * Function        check_sdp_bl

 *

 * Description     Checks if a given device is blacklisted to skip sdp

 * Description     Checks if a given device is rejectlisted to skip sdp

 *

 * Parameters     skip_sdp_entry

 *

 * Returns         true if the device is present in blacklist, else false

 * Returns         true if the device is present in rejectlist, else false

 *

 ******************************************************************************/

bool check_sdp_bl(const RawAddress* remote_bdaddr) {
@@ -418,8 +418,8 @@ bool check_sdp_bl(const RawAddress* remote_bdaddr) { 
  }

  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;

  for (unsigned int i = 0; i < ARRAY_SIZE(sdp_rejectlist); i++) {

    if (manufacturer == sdp_rejectlist[i].manufact_id) return true;

  }

  return false;

}