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

Commit 1a5813cb authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Remove legacy hci role handler and add back role reject list" am: 656bd12f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2129341



Change-Id: I9bf0675c72ba35682f4155cc7c8c388434e37e2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43ff4b50 656bd12f

system/stack/acl/btm_acl.cc

+2 −0
Original line number Diff line number Diff line
@@ -1416,6 +1416,8 @@ void StackAclBtmAcl::btm_acl_role_changed(tHCI_STATUS hci_status, 


void btm_acl_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                          tHCI_ROLE new_role) {

  btm_rejectlist_role_change_device(bd_addr, hci_status);



  if (hci_status == HCI_SUCCESS) {

    l2c_link_role_changed(&bd_addr, new_role, hci_status);

  } else {

system/stack/btu/btu_hcif.cc

+1 −26
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ static void btu_hcif_command_complete_evt(BT_HDR* response, void* context); 
static void btu_hcif_command_status_evt(uint8_t status, BT_HDR* command,

                                        void* context);

static void btu_hcif_hardware_error_evt(uint8_t* p);

static void btu_hcif_role_change_evt(const uint8_t* p);

static void btu_hcif_mode_change_evt(uint8_t* p);

static void btu_hcif_link_key_notification_evt(const uint8_t* p);

static void btu_hcif_read_clock_off_comp_evt(uint8_t* p);
@@ -283,9 +282,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
    case HCI_HARDWARE_ERROR_EVT:

      btu_hcif_hardware_error_evt(p);

      break;

    case HCI_ROLE_CHANGE_EVT:

      btu_hcif_role_change_evt(p);

      break;

    case HCI_NUM_COMPL_DATA_PKTS_EVT:

      acl_process_num_completed_pkts(p, hci_evt_len);

      break;
@@ -430,6 +426,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
    case HCI_CONNECTION_COMP_EVT:  // EventCode::CONNECTION_COMPLETE

    case HCI_READ_RMT_FEATURES_COMP_EVT:  // EventCode::READ_REMOTE_SUPPORTED_FEATURES_COMPLETE

    case HCI_READ_RMT_VERSION_COMP_EVT:  // EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE

    case HCI_ROLE_CHANGE_EVT:            // EventCode::ROLE_CHANGE

    default:

      LOG_ERROR(

          "Unexpectedly received event_code:0x%02x that should not be "
@@ -1488,28 +1485,6 @@ static void btu_hcif_hardware_error_evt(uint8_t* p) { 
  BTA_sys_signal_hw_error();

}



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

 *

 * Function         btu_hcif_role_change_evt

 *

 * Description      Process event HCI_ROLE_CHANGE_EVT

 *

 * Returns          void

 *

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

static void btu_hcif_role_change_evt(const uint8_t* p) {

  uint8_t status;

  RawAddress bda;

  uint8_t role;



  STREAM_TO_UINT8(status, p);

  STREAM_TO_BDADDR(bda, p);

  STREAM_TO_UINT8(role, p);



  btm_rejectlist_role_change_device(bda, status);

  btm_acl_role_changed(to_hci_status_code(status), bda, to_hci_role(role));

}



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

 *

 * Function         btu_hcif_mode_change_evt