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

Commit 67dd5e02 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I5fde6ed7,I7fde5b8d into main 

* changes:
  Remove unused gatt_notify_conn_update
  btm_sco: Move LOG_TAG to the top
parents 135b4799 48b4d11b

system/main/shim/l2c_api.cc

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 
#include "types/ble_address_with_type.h"

#include "types/raw_address.h"



void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval,

                             uint16_t latency, uint16_t timeout,

                             tHCI_STATUS status);

void gatt_notify_phy_updated(tHCI_STATUS status, uint16_t handle,

                             uint8_t tx_phy, uint8_t rx_phy);

system/stack/btm/btm_sco.cc

+4 −3
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
 *

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



#define LOG_TAG "btm_sco"



#include "stack/btm/btm_sco.h"



#include <base/logging.h>

#include <base/strings/stringprintf.h>
@@ -30,8 +34,6 @@ 
#include <cstring>

#include <string>



#define LOG_TAG "btm_sco"



#include "common/bidi_queue.h"

#include "device/include/controller.h"

#include "device/include/device_iot_config.h"
@@ -42,7 +44,6 @@ 
#include "osi/include/properties.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sco.h"

#include "stack/btm/btm_sco_hfp_hal.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

system/stack/l2cap/l2c_ble.cc

+0 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ using base::StringPrintf; 


static void l2cble_start_conn_update(tL2C_LCB* p_lcb);

static void l2cble_start_subrate_change(tL2C_LCB* p_lcb);

void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval,

                             uint16_t latency, uint16_t timeout,

                             tHCI_STATUS status);



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

 *