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

Commit 5894d865 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move source btm/btm_acl to acl/btm_acl"

parents 0a1464c8 4f916be9

system/stack/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ cc_library_static { 
        "bnep/bnep_main.cc",

        "bnep/bnep_utils.cc",

        "btm/ble_advertiser_hci_interface.cc",

        "btm/btm_acl.cc",

        "acl/btm_acl.cc",

        "btm/btm_ble.cc",

        "btm/btm_ble_addr.cc",

        "btm/btm_ble_adv_filter.cc",

system/stack/btm/btm_acl.cc→system/stack/acl/btm_acl.cc

+15 −14
Original line number Diff line number Diff line
@@ -1101,7 +1101,8 @@ void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len) { 
  if (page_num > max_page) {

    BTM_TRACE_WARNING(

        "btm_read_remote_ext_features_complete num_page=%d, max_page=%d "

        "invalid", page_num, max_page);

        "invalid",

        page_num, max_page);

  }



  p_acl_cb = &btm_cb.acl_cb_.acl_db[acl_idx];