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

Commit e1402750 authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 56fc7a73: remove all advertised services in SDP btif_av_init is called... 

am 56fc7a73: remove all advertised services in SDP btif_av_init is called twice. Don\'t need call it in enable. disable EDR ATT SDP record

* commit '56fc7a73':
  remove all advertised services in SDP btif_av_init is called twice. Don't need call it in enable. disable EDR ATT SDP record
parents 6c222c22 56fc7a73

system/btif/src/btif_core.c

+0 −3
Original line number Diff line number Diff line
@@ -607,9 +607,6 @@ void btif_enable_bluetooth_evt(tBTA_STATUS status, BD_ADDR local_bd) 
    /* callback to HAL */

    if (status == BTA_SUCCESS)

    {

        /* initialize a2dp service */

        btif_av_init();



        /* init rfcomm & l2cap api */

        btif_sock_init();

system/include/bt_target.h

+8 −0
Original line number Diff line number Diff line
@@ -1462,6 +1462,14 @@ and USER_HW_DISABLE_API macros */ 
#define BLE_DELAY_REQUEST_ENC        FALSE

#endif



#ifndef GAP_TRANSPORT_SUPPORTED

#define GAP_TRANSPORT_SUPPORTED      GATT_TRANSPORT_LE_BR_EDR

#endif



#ifndef GATTP_TRANSPORT_SUPPORTED

#define GATTP_TRANSPORT_SUPPORTED    GATT_TRANSPORT_LE_BR_EDR

#endif



#ifndef GATT_MAX_SR_PROFILES

#define GATT_MAX_SR_PROFILES        32 /* max is 32 */

#endif

system/stack/include/gap_api.h

+0 −5
Original line number Diff line number Diff line
@@ -146,11 +146,6 @@ 
#define  GAP_PREFER_CONN_SP_TOUT         2000

#endif



#if BLE_INCLUDED == TRUE

#ifndef GAP_TRANSPORT_SUPPORTED

#define GAP_TRANSPORT_SUPPORTED GATT_TRANSPORT_LE_BR_EDR

#endif

#endif

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

**  Type Definitions

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

system/stack/include/gatt_api.h

+0 −4
Original line number Diff line number Diff line
@@ -137,10 +137,6 @@ typedef UINT16 tGATT_DISCONN_REASON; 
    #define GATT_MAX_SCCB       10

#endif



#ifndef GATTP_TRANSPORT_SUPPORTED

#define GATTP_TRANSPORT_SUPPORTED        GATT_TRANSPORT_LE_BR_EDR

#endif





/* GATT notification caching timer, default to be three seconds

*/