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

Commit b45fd721 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "Improve the implementation of GetAclInterface" am: 9c697179 

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



Change-Id: Ib6dbea31f95d09ee1d4db873b94ba5d9d2448a73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c903bda 9c697179

system/main/shim/acl_legacy_interface.cc

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ namespace bluetooth { 
namespace shim {

namespace legacy {



const acl_interface_t GetAclInterface() {

  acl_interface_t acl_interface{

const acl_interface_t& GetAclInterface() {

  static acl_interface_t acl_interface{

      .on_send_data_upwards = acl_rcv_acl_data,

      .on_packets_completed = acl_packets_completed,

system/main/shim/acl_legacy_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ typedef struct { 
  acl_link_interface_t link;

} acl_interface_t;



const acl_interface_t GetAclInterface();

const acl_interface_t& GetAclInterface();



}  // namespace legacy

}  // namespace shim