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

Commit f1458e8c authored by VenkatRaghavan VijayaRaghavan's avatar VenkatRaghavan VijayaRaghavan Committed by Andre Eisenbach
Browse files

Bug fix PM changes and LE connectivity mode fixes 

Allow PM to support multiple delay timer for different profiles and
power mode requests. And set correct connectivity mode.

Bug: 22040710
Change-Id: Idabd9ea944f0c5a89ce542d85db9f103fa7d1816
parent ff840ebd

system/bta/dm/bta_dm_act.c

+288 −256

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/dm/bta_dm_api.c

+62 −28
Original line number Diff line number Diff line
@@ -353,7 +353,16 @@ void BTA_DmDiscoverUUID(BD_ADDR bd_addr, tSDP_UUID *uuid, 
*******************************************************************************/

void BTA_DmBond(BD_ADDR bd_addr)

{

    BTA_DmBondByTransport (bd_addr, BTA_TRANSPORT_UNKNOWN);

    tBTA_DM_API_BOND    *p_msg;



    p_msg = (tBTA_DM_API_BOND *) GKI_getbuf(sizeof(tBTA_DM_API_BOND));

    if (p_msg != NULL)

    {

        p_msg->hdr.event = BTA_DM_API_BOND_EVT;

        bdcpy(p_msg->bd_addr, bd_addr);

        p_msg->transport = BTA_TRANSPORT_UNKNOWN;

        bta_sys_sendmsg(p_msg);

    }

}



/*******************************************************************************
@@ -444,7 +453,10 @@ void BTA_DmPinReply(BD_ADDR bd_addr, BOOLEAN accept, UINT8 pin_len, UINT8 *p_pin 
** Function         BTA_DmLocalOob

**

** Description      This function retrieves the OOB data from local controller.

**                  The result is reported by bta_dm_co_loc_oob().

**                  The result is reported by:

**                  - bta_dm_co_loc_oob_ext() if device supports secure

**                    connections (SC)

**                  - bta_dm_co_loc_oob() if device doesn't support SC

**

** Returns          void

**
@@ -525,7 +537,7 @@ void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, LINK_KEY link_key, 
            memcpy (p_msg->dc, dev_class, DEV_CLASS_LEN);

        }



        memset (p_msg->bd_name, 0, BD_NAME_LEN);

        memset (p_msg->bd_name, 0, BD_NAME_LEN + 1);

        memset (p_msg->features, 0, sizeof (p_msg->features));

        p_msg->pin_length = pin_length;
@@ -539,7 +551,7 @@ void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, LINK_KEY link_key, 
** Function         BTA_DmRemoveDevice

**

** Description      This function removes a device fromthe security database list of

**                  peer device

**                  peer device. It manages unpairing even while connected.

**

**

** Returns          void
@@ -699,7 +711,8 @@ void bta_dmexecutecallback (tBTA_DM_EXEC_CBACK* p_callback, void * p_param) 
**                  p_le_key         - LE key values.

**                  key_type         - LE SMP key type.

**

** Returns          void

** Returns          BTA_SUCCESS if successful

**                  BTA_FAIL if operation failed.

**

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

void BTA_DmAddBleKey (BD_ADDR bd_addr, tBTA_LE_KEY_VALUE *p_le_key, tBTA_LE_KEY_TYPE key_type)
@@ -1213,6 +1226,13 @@ extern void BTA_DmBleTrackAdvertiser(tBTA_DM_BLE_REF_VALUE ref_value, 
    }

}



#endif



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

**                      BLE ADV data management API

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

#if BLE_INCLUDED == TRUE



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

**

** Function         BTA_DmBleBroadcast
@@ -1283,6 +1303,7 @@ void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type, tBTA_DM_BLE_SEL_ 
** Returns          void

**

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

#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,

                    tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search,

                    tBTA_TRANSPORT transport)
@@ -1318,7 +1339,7 @@ static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_s 
        bta_sys_sendmsg(p_msg);

    }

}



#endif

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

**

** Function         BTA_DmDiscoverByTransport
@@ -1330,21 +1351,18 @@ static void bta_dm_discover_send_msg(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_s 
**                  UUID of interested services should be provided through

**                  p_services->p_uuid.

**

** Parameters       bd_addr: Bluetooth address of remote device

**                  p_services :bit mask of the list of services to be discovered

**                  p_cback : Callback on which result will be received

**                  sdp_search: if TRUE SDP search will be initiated, else services present in

**                                     EIR structure of remote device will be returned.

**                  transport : Physical transport BR/EDR or LE

**

**

** Returns          void

**

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



void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,

                    tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search,

                    tBTA_TRANSPORT transport)

{

#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

    bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, transport);

#endif

}
@@ -1358,11 +1376,7 @@ void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_service 
**                  UUID of interested services should be provided through

**                  p_services->p_uuid.

**

** Parameters       bd_addr: Bluetooth address of remote device

**                  p_services :bit mask of the list of services to be discovered

**                  p_cback : Callback on which result will be received

**                  sdp_search: if TRUE SDP search will be initiated, else services present in

**                                     EIR structure of remote device will be returned.

**

**

** Returns          void

**
@@ -1370,7 +1384,9 @@ void BTA_DmDiscoverByTransport(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_service 
void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT *p_services,

                    tBTA_DM_SEARCH_CBACK *p_cback, BOOLEAN sdp_search)

{

#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

    bta_dm_discover_send_msg(bd_addr, p_services, p_cback, sdp_search, BTA_TRANSPORT_UNKNOWN);

#endif



}
@@ -1432,26 +1448,44 @@ void BTA_DmSearchExt(tBTA_DM_INQ *p_dm_inq, tBTA_SERVICE_MASK_EXT *p_services, t 
    UNUSED(p_cback);

#endif

}



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

**

** Function         BTA_DmBleEnableRemotePrivacy

** Function         BTA_DmBleUpdateConnectionParam

**

** Description      Enable/disable privacy on a remote device

** Description      Update connection parameters, can only be used when connection is up.

**

** Parameters:      bd_addr          - BD address of the peer

**                  privacy_enable   - enable/disabe privacy on remote device.

**                  min_int   -     minimum connection interval, [0x0004~ 0x4000]

**                  max_int   -     maximum connection interval, [0x0004~ 0x4000]

**                  latency   -     slave latency [0 ~ 500]

**                  timeout   -     supervision timeout [0x000a ~ 0xc80]

**

** Returns          void

**

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

void BTA_DmBleEnableRemotePrivacy(BD_ADDR bd_addr, BOOLEAN privacy_enable)

void BTA_DmBleUpdateConnectionParam(BD_ADDR bd_addr, UINT16 min_int,

                                    UINT16 max_int, UINT16 latency,

                                    UINT16 timeout)

{

    UNUSED(bd_addr);

    UNUSED(privacy_enable);

}

#if BLE_INCLUDED == TRUE

    tBTA_DM_API_UPDATE_CONN_PARAM *p_msg;



    p_msg = (tBTA_DM_API_UPDATE_CONN_PARAM *) GKI_getbuf(sizeof(tBTA_DM_API_UPDATE_CONN_PARAM));

    if (p_msg != NULL)

    {

        memset(p_msg, 0, sizeof(tBTA_DM_API_UPDATE_CONN_PARAM));



        p_msg->hdr.event = BTA_DM_API_UPDATE_CONN_PARAM_EVT;

        bdcpy(p_msg->bd_addr, bd_addr);

        p_msg->min_int   = min_int;

        p_msg->max_int   = max_int;

        p_msg->latency   = latency;

        p_msg->timeout   = timeout;



        bta_sys_sendmsg(p_msg);

    }

#endif

}

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

**

** Function         BTA_DmBleConfigLocalPrivacy
@@ -1680,13 +1714,13 @@ void BTA_DmBleCfgFilterCondition(tBTA_DM_BLE_SCAN_COND_OP action, 
    if ((p_msg = (tBTA_DM_API_CFG_FILTER_COND *) GKI_getbuf(len)) != NULL)

    {

        memset (p_msg, 0, len);



        p_msg->hdr.event        = BTA_DM_API_CFG_FILTER_COND_EVT;

        p_msg->action           = action;

        p_msg->cond_type        = cond_type;

        p_msg->filt_index       = filt_index;

        p_msg->p_filt_cfg_cback = p_cmpl_cback;

        p_msg->ref_value        = ref_value;



        if (p_cond)

        {

            p_msg->p_cond_param = (tBTA_DM_BLE_PF_COND_PARAM *)(p_msg + 1);

system/bta/dm/bta_dm_cfg.c

+55 −24
Original line number Diff line number Diff line
@@ -112,11 +112,11 @@ tBTA_DM_CFG *p_bta_dm_cfg = (tBTA_DM_CFG *)&bta_dm_cfg; 
tBTA_DM_RM *p_bta_dm_rm_cfg = (tBTA_DM_RM *)&bta_dm_rm_cfg;



#if BLE_INCLUDED == TRUE

#  define BTA_DM_NUM_PM_ENTRY         22  /* number of entries in bta_dm_pm_cfg except the first */

#  define BTA_DM_NUM_PM_SPEC          14  /* number of entries in bta_dm_pm_spec */

#  define BTA_DM_NUM_PM_ENTRY         23  /* number of entries in bta_dm_pm_cfg except the first */

#  define BTA_DM_NUM_PM_SPEC          15  /* number of entries in bta_dm_pm_spec */

#else

#  define BTA_DM_NUM_PM_ENTRY         20  /* number of entries in bta_dm_pm_cfg except the first */

#  define BTA_DM_NUM_PM_SPEC          12  /* number of entries in bta_dm_pm_spec */

#  define BTA_DM_NUM_PM_ENTRY         21  /* number of entries in bta_dm_pm_cfg except the first */

#  define BTA_DM_NUM_PM_SPEC          13  /* number of entries in bta_dm_pm_spec */

#endif



tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] =
@@ -127,6 +127,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] 
  {BTA_ID_CG,  BTA_ALL_APP_ID,      1},  /* cg resue ct spec table */

  {BTA_ID_DG,  BTA_ALL_APP_ID,      2},  /* dg spec table */

  {BTA_ID_AV,  BTA_ALL_APP_ID,      4},  /* av spec table */

  {BTA_ID_AVK, BTA_ALL_APP_ID,      13}, /* avk spec table */

  {BTA_ID_FTC, BTA_ALL_APP_ID,      6},  /* ftc spec table */

  {BTA_ID_FTS, BTA_ALL_APP_ID,      7},  /* fts spec table */

  {BTA_ID_HD,  BTA_ALL_APP_ID,      3},  /* hd spec table */
@@ -195,14 +196,14 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  (BTA_DM_PM_SSR2),                                              /* the SSR entry */

#endif

  {

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  active */

      {{BTA_DM_PM_SNIFF,    5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open active */

      {{BTA_DM_PM_NO_PREF,   0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn close  */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_SNIFF,    1000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,   0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },
@@ -220,8 +221,8 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close */

      {{BTA_DM_PM_SNIFF_HD_IDLE_IDX, 5000}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

      {{BTA_DM_PM_SNIFF_HD_ACTIVE_IDX, 0}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

      {{BTA_DM_PM_SNIFF2, 5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF4,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },
@@ -258,8 +259,8 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close, used for HH suspend   */

      {{BTA_DM_PM_SNIFF_HH_IDLE_IDX, BTA_DM_PM_HH_IDLE_DELAY}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

      {{BTA_DM_PM_SNIFF_HH_ACTIVE_IDX, BTA_DM_PM_HH_ACTIVE_DELAY}, {BTA_DM_PM_NO_ACTION, 0}}, /* busy */

      {{BTA_DM_PM_SNIFF2, 7000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },
@@ -277,7 +278,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 5000}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }
@@ -334,12 +335,30 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 7000}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },



    /* AVK : 13 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)

  (BTA_DM_PM_SSR2),                                              /* the SSR entry */

#endif

  {

      {{BTA_DM_PM_SNIFF,  3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  sniff */

      {{BTA_DM_PM_NO_PREF,   0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn close  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF4, 3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },

  /* NAP */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */
@@ -353,8 +372,9 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 5000}, {BTA_DM_PM_NO_ACTION, 0}}, /* idle */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},   /* busy */



      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },
@@ -450,13 +470,24 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
 */

tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] =

{

/*

 * More sniff parameter entries can be added for

 * BTA_DM_PM_SNIFF3 - BTA_DM_PM_SNIFF7, if needed. When entries are added or

 * removed, BTA_DM_PM_PARK_IDX needs to be updated to reflect the actual index

 * BTA_DM_PM_PARK_IDX is defined in bta_api.h and can be override by the

 * bdroid_buildcfg.h settings.

 * The SNIFF table entries must be in the order from highest latency (biggest

 * interval) to lowest latency. If there's a conflict among the connected

 * services, the setting with lowest latency wins.

 */

/* sniff modes: max interval, min interval, attempt, timeout */

  {BTA_DM_PM_SNIFF_MAX,  BTA_DM_PM_SNIFF_MIN,  BTA_DM_PM_SNIFF_ATTEMPT,  BTA_DM_PM_SNIFF_TIMEOUT,  BTM_PM_MD_SNIFF}, /*for BTA_DM_PM_SNIFF - A2DP */

  {BTA_DM_PM_SNIFF1_MAX, BTA_DM_PM_SNIFF1_MIN, BTA_DM_PM_SNIFF1_ATTEMPT, BTA_DM_PM_SNIFF1_TIMEOUT, BTM_PM_MD_SNIFF}, /*for BTA_DM_PM_SNIFF1 */

  {BTA_DM_PM_SNIFF2_MAX, BTA_DM_PM_SNIFF2_MIN, BTA_DM_PM_SNIFF2_ATTEMPT, BTA_DM_PM_SNIFF2_TIMEOUT, BTM_PM_MD_SNIFF}, /*for BTA_DM_PM_SNIFF2- HD idle */

  {BTA_DM_PM_SNIFF3_MAX, BTA_DM_PM_SNIFF3_MIN, BTA_DM_PM_SNIFF3_ATTEMPT, BTA_DM_PM_SNIFF3_TIMEOUT, BTM_PM_MD_SNIFF}, /*for BTA_DM_PM_SNIFF3- SCO open */

  {BTA_DM_PM_SNIFF4_MAX, BTA_DM_PM_SNIFF4_MIN, BTA_DM_PM_SNIFF4_ATTEMPT, BTA_DM_PM_SNIFF4_TIMEOUT, BTM_PM_MD_SNIFF}, /*for BTA_DM_PM_SNIFF4- HD active*/

  {BTA_DM_PM_PARK_MAX,   BTA_DM_PM_PARK_MIN,   BTA_DM_PM_PARK_ATTEMPT,   BTA_DM_PM_PARK_TIMEOUT,   BTM_PM_MD_PARK}

  {800, 400, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF - A2DP */

  {400, 200, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF1 */

  {180, 150, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF2- HD idle */

  {150,  50, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF3- SCO open */

  { 54,  30, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF4- HD active */

  { 36,  36, 2, 0, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF5- HD active */

  {800, 400, 0, 0, BTM_PM_MD_PARK}



#ifdef BTE_SIM_APP      /* For Insight builds only */

  /* Entries at the end of the bta_dm_pm_md table are user-defined (runtime configurable),

system/bta/dm/bta_dm_int.h

+67 −17
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ enum 
    BTA_DM_API_DISABLE_EVT,

    BTA_DM_API_SET_NAME_EVT,

    BTA_DM_API_SET_VISIBILITY_EVT,



    BTA_DM_ACL_CHANGE_EVT,

    BTA_DM_API_ADD_DEVICE_EVT,

    BTA_DM_API_REMOVE_ACL_EVT,
@@ -72,14 +73,12 @@ enum 


    BTA_DM_API_SET_ENCRYPTION_EVT,





#if (BTM_OOB_INCLUDED == TRUE)

    BTA_DM_API_LOC_OOB_EVT,

    BTA_DM_CI_IO_REQ_EVT,

    BTA_DM_CI_RMT_OOB_EVT,

#endif /* BTM_OOB_INCLUDED */



    BTA_DM_API_REMOVE_DEVICE_EVT,



#if BLE_INCLUDED == TRUE

    BTA_DM_API_ADD_BLEKEY_EVT,
@@ -89,8 +88,8 @@ enum 
    BTA_DM_API_BLE_SEC_GRANT_EVT,

    BTA_DM_API_BLE_SET_BG_CONN_TYPE,

    BTA_DM_API_BLE_CONN_PARAM_EVT,

    BTA_DM_API_BLE_SCAN_PARAM_EVT,

    BTA_DM_API_BLE_CONN_SCAN_PARAM_EVT,

    BTA_DM_API_BLE_SCAN_PARAM_EVT,

    BTA_DM_API_BLE_OBSERVE_EVT,

    BTA_DM_API_UPDATE_CONN_PARAM_EVT,

#if BLE_PRIVACY_SPT == TRUE
@@ -117,11 +116,14 @@ enum 
    BTA_DM_API_BLE_READ_SCAN_REPORTS_EVT,

    BTA_DM_API_BLE_TRACK_ADVERTISER_EVT,

    BTA_DM_API_BLE_ENERGY_INFO_EVT,



#endif



    BTA_DM_API_ENABLE_TEST_MODE_EVT,

    BTA_DM_API_DISABLE_TEST_MODE_EVT,

    BTA_DM_API_EXECUTE_CBACK_EVT,

    BTA_DM_API_REMOVE_ALL_ACL_EVT,

    BTA_DM_API_REMOVE_DEVICE_EVT,

    BTA_DM_MAX_EVT

};
@@ -140,6 +142,7 @@ enum 
    BTA_DM_DISCOVERY_RESULT_EVT,

    BTA_DM_API_DI_DISCOVER_EVT,

    BTA_DM_DISC_CLOSE_TOUT_EVT



};



/* data type for BTA_DM_API_ENABLE_EVT */
@@ -337,7 +340,7 @@ typedef struct 
{

    BT_HDR          hdr;

    BD_ADDR         bd_addr;



    tBTA_DM_PM_ACTION  pm_request;

} tBTA_DM_PM_TIMER;
@@ -463,6 +466,14 @@ typedef struct 
    tBLE_SCAN_PARAM_SETUP_CBACK scan_param_setup_cback;

}tBTA_DM_API_BLE_SCAN_PARAMS;



/* set scan parameter for BLE connections */

typedef struct

{

    BT_HDR                  hdr;

    UINT16                  scan_int;

    UINT16                  scan_window;

} tBTA_DM_API_BLE_CONN_SCAN_PARAMS;



/* Data type for start/stop observe */

typedef struct

{
@@ -594,6 +605,14 @@ typedef struct 
    tBTA_TRANSPORT transport;



}tBTA_DM_API_REMOVE_ACL;



/* data type for BTA_DM_API_REMOVE_ALL_ACL_EVT */

typedef struct

{

    BT_HDR      hdr;

    tBTA_DM_LINK_TYPE link_type;



} tBTA_DM_API_REMOVE_ALL_ACL;

typedef struct

{

    BT_HDR      hdr;
@@ -693,6 +712,7 @@ typedef union 
    tBTA_DM_API_BLE_SEC_GRANT           ble_sec_grant;

    tBTA_DM_API_BLE_SET_BG_CONN_TYPE    ble_set_bd_conn_type;

    tBTA_DM_API_BLE_CONN_PARAMS         ble_set_conn_params;

    tBTA_DM_API_BLE_CONN_SCAN_PARAMS    ble_set_conn_scan_params;

    tBTA_DM_API_BLE_SCAN_PARAMS         ble_set_scan_params;

    tBTA_DM_API_BLE_OBSERVE             ble_observe;

    tBTA_DM_API_ENABLE_PRIVACY          ble_remote_privacy;
@@ -721,6 +741,7 @@ typedef union 
#endif



    tBTA_DM_API_REMOVE_ACL              remove_acl;

    tBTA_DM_API_REMOVE_ALL_ACL          remove_all_acl;



} tBTA_DM_MSG;
@@ -741,6 +762,12 @@ typedef UINT8 tBTA_DM_CONN_STATE; 
#define BTA_DM_DI_ACP_SNIFF     0x04       /* set this bit if peer init sniff */

typedef UINT8 tBTA_DM_DEV_INFO;



/* set power mode request type */

#define BTA_DM_PM_RESTART       1

#define BTA_DM_PM_NEW_REQ       2

#define BTA_DM_PM_EXECUTE       3

typedef UINT8   tBTA_DM_PM_REQ;



typedef struct

{

    BD_ADDR                     peer_bdaddr;
@@ -753,11 +780,13 @@ typedef struct 
#if (BTM_SSR_INCLUDED == TRUE)

    tBTM_PM_STATUS              prev_low;   /* previous low power mode used */

#endif

    tBTA_DM_PM_ACTTION          pm_mode_attempted;

    tBTA_DM_PM_ACTTION          pm_mode_failed;

    tBTA_DM_PM_ACTION           pm_mode_attempted;

    tBTA_DM_PM_ACTION           pm_mode_failed;

    BOOLEAN                     remove_dev_pending;

#if BLE_INCLUDED == TRUE

    UINT16                      conn_handle;

    tBT_TRANSPORT               transport;

#endif

} tBTA_DM_PEER_DEVICE;
@@ -780,11 +809,13 @@ typedef struct 
    tBTA_SYS_ID             id;

    UINT8                   app_id;

    tBTA_SYS_CONN_STATUS    state;



    BOOLEAN                 new_request;



} tBTA_DM_SRVCS;



#define BTA_DM_NUM_CONN_SRVS   5

#ifndef BTA_DM_NUM_CONN_SRVS

#define BTA_DM_NUM_CONN_SRVS   10

#endif



typedef struct

{
@@ -796,15 +827,27 @@ typedef struct 


typedef struct

{

    TIMER_LIST_ENT          timer;

#define BTA_DM_PM_SNIFF_TIMER_IDX   0

#define BTA_DM_PM_PARK_TIMER_IDX    1

#define BTA_DM_PM_SUSPEND_TIMER_IDX 2

#define BTA_DM_PM_MODE_TIMER_MAX    3

    /*

     * Keep three different timers for PARK, SNIFF and SUSPEND if TBFC is

     * supported.

     */

    TIMER_LIST_ENT          timer[BTA_DM_PM_MODE_TIMER_MAX];



    UINT8                   srvc_id[BTA_DM_PM_MODE_TIMER_MAX];

    UINT8                   pm_action[BTA_DM_PM_MODE_TIMER_MAX];

    UINT8                   active;     /* number of active timer */



    BD_ADDR                 peer_bdaddr;

    BOOLEAN                 in_use;



} tBTA_PM_TIMER;



extern tBTA_DM_CONNECTED_SRVCS bta_dm_conn_srvcs;



#define BTA_DM_NUM_PM_TIMER 3

#define BTA_DM_NUM_PM_TIMER 7



/* DM control block */

typedef struct
@@ -856,6 +899,8 @@ typedef struct 


#endif





    tBTA_DM_ENCRYPT_CBACK      *p_encrypt_cback;

    TIMER_LIST_ENT              switch_delay_timer;



} tBTA_DM_CB;
@@ -886,6 +931,7 @@ typedef struct 
    tSDP_UUID              uuid;

    UINT8                  peer_scn;

    BOOLEAN                sdp_search;

    BOOLEAN                cancel_pending; /* inquiry cancel is pending */

    tBTA_TRANSPORT         transport;

#if ((defined BLE_INCLUDED) && (BLE_INCLUDED == TRUE))

    tBTA_DM_SEARCH_CBACK * p_scan_cback;
@@ -899,8 +945,8 @@ typedef struct 
    UINT8 *                 p_ble_rawdata;

    UINT32                 ble_raw_size;

    UINT32                 ble_raw_used;

    TIMER_LIST_ENT         gatt_close_timer;

    BD_ADDR                pending_close_bda;

    TIMER_LIST_ENT         gatt_close_timer; /* GATT channel close delay timer */

    BD_ADDR                pending_close_bda; /* pending GATT channel remote device address */

#endif

#endif
@@ -940,8 +986,6 @@ typedef struct 


extern const UINT32 bta_service_id_to_btm_srv_id_lkup_tbl[];



extern const tBTA_DM_CFG bta_dm_cfg;





typedef struct

{
@@ -967,7 +1011,7 @@ typedef struct 
typedef struct

{



  tBTA_DM_PM_ACTTION  power_mode;

  tBTA_DM_PM_ACTION   power_mode;

  UINT16              timeout;



} tBTA_DM_PM_ACTN;
@@ -1042,6 +1086,9 @@ extern void bta_dm_enable (tBTA_DM_MSG *p_data); 
extern void bta_dm_disable (tBTA_DM_MSG *p_data);

extern void bta_dm_set_dev_name (tBTA_DM_MSG *p_data);

extern void bta_dm_set_visibility (tBTA_DM_MSG *p_data);



extern void bta_dm_set_scan_config(tBTA_DM_MSG *p_data);

extern void bta_dm_vendor_spec_command(tBTA_DM_MSG *p_data);

extern void bta_dm_bond (tBTA_DM_MSG *p_data);

extern void bta_dm_bond_cancel (tBTA_DM_MSG *p_data);

extern void bta_dm_pin_reply (tBTA_DM_MSG *p_data);
@@ -1104,6 +1151,7 @@ extern void bta_dm_ci_rmt_oob_act(tBTA_DM_MSG *p_data); 
extern void bta_dm_init_pm(void);

extern void bta_dm_disable_pm(void);



extern UINT8 bta_dm_get_av_count(void);

extern void bta_dm_search_start (tBTA_DM_MSG *p_data);

extern void bta_dm_search_cancel (tBTA_DM_MSG *p_data);

extern void bta_dm_discover (tBTA_DM_MSG *p_data);
@@ -1133,4 +1181,6 @@ extern void bta_dm_enable_test_mode(tBTA_DM_MSG *p_data); 
extern void bta_dm_disable_test_mode(tBTA_DM_MSG *p_data);

extern void bta_dm_execute_callback(tBTA_DM_MSG *p_data);





extern void bta_dm_remove_all_acl(tBTA_DM_MSG *p_data);

#endif /* BTA_DM_INT_H */

system/bta/dm/bta_dm_main.c

+7 −9
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ const tBTA_DM_ACTION bta_dm_action[] = 
    bta_dm_ci_rmt_oob_act,    /* 22 BTA_DM_CI_RMT_OOB_EVT */

#endif /* BTM_OOB_INCLUDED */



    bta_dm_remove_device,      /*  BTA_DM_API_REMOVE_DEVICE_EVT */



#if BLE_INCLUDED == TRUE

    bta_dm_add_blekey,          /*  BTA_DM_API_ADD_BLEKEY_EVT           */
@@ -95,7 +94,7 @@ const tBTA_DM_ACTION bta_dm_action[] = 
#endif

    bta_dm_ble_set_adv_params,     /* BTA_DM_API_BLE_ADV_PARAM_EVT */

    bta_dm_ble_set_adv_config,     /* BTA_DM_API_BLE_SET_ADV_CONFIG_EVT */

    bta_dm_ble_set_scan_rsp,       /* BTA_DM_API_BLE_SET_SCAN_RSP_EVT */

    bta_dm_ble_set_scan_rsp,       /* BTA_DM_API_BLE_SET_SCAN_RSPT */

    bta_dm_ble_broadcast,          /* BTA_DM_API_BLE_BROADCAST_EVT */

    bta_dm_ble_set_data_length,    /* BTA_DM_API_SET_DATA_LENGTH_EVT */

#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
@@ -118,6 +117,9 @@ const tBTA_DM_ACTION bta_dm_action[] = 
    bta_dm_enable_test_mode,    /*  BTA_DM_API_ENABLE_TEST_MODE_EVT     */

    bta_dm_disable_test_mode,   /*  BTA_DM_API_DISABLE_TEST_MODE_EVT    */

    bta_dm_execute_callback,    /*  BTA_DM_API_EXECUTE_CBACK_EVT        */



    bta_dm_remove_all_acl,      /* BTA_DM_API_REMOVE_ALL_ACL_EVT */

    bta_dm_remove_device,       /* BTA_DM_API_REMOVE_DEVICE_EVT */

};
@@ -202,7 +204,6 @@ const UINT8 bta_dm_search_idle_st_table[][BTA_DM_SEARCH_NUM_COLS] = 
#if BLE_INCLUDED == TRUE

/* DISC_CLOSE_TOUT_EVT */   ,{BTA_DM_CLOSE_GATT_CONN,           BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_IDLE}

#endif



};

const UINT8 bta_dm_search_search_active_st_table[][BTA_DM_SEARCH_NUM_COLS] =

{
@@ -217,9 +218,8 @@ const UINT8 bta_dm_search_search_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = 
/* SEARCH_CMPL_EVT */       {BTA_DM_SEARCH_CMPL,               BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_IDLE},

/* DISCV_RES_EVT */         {BTA_DM_SEARCH_RESULT,             BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_ACTIVE},

/* API_DI_DISCOVER_EVT */   {BTA_DM_SEARCH_IGNORE,             BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_ACTIVE}



#if BLE_INCLUDED == TRUE

/* DISC_CLOSE_TOUT_EVT */   ,{BTA_DM_SEARCH_IGNORE,             BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_ACTIVE}

/* DISC_CLOSE_TOUT_EVT */   ,{BTA_DM_CLOSE_GATT_CONN,          BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_ACTIVE}

#endif



};
@@ -237,7 +237,6 @@ const UINT8 bta_dm_search_search_cancelling_st_table[][BTA_DM_SEARCH_NUM_COLS] = 
/* SEARCH_CMPL_EVT */       {BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL, BTA_DM_SEARCH_CANCEL_CMPL,     BTA_DM_SEARCH_IDLE},

/* DISCV_RES_EVT */         {BTA_DM_SEARCH_CANCEL_TRANSAC_CMPL, BTA_DM_SEARCH_CANCEL_CMPL,     BTA_DM_SEARCH_IDLE},

/* API_DI_DISCOVER_EVT */   {BTA_DM_SEARCH_IGNORE,              BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_CANCELLING}



#if BLE_INCLUDED == TRUE

/* DISC_CLOSE_TOUT_EVT */   ,{BTA_DM_SEARCH_IGNORE,              BTA_DM_SEARCH_IGNORE,          BTA_DM_SEARCH_CANCELLING}

#endif
@@ -261,7 +260,6 @@ const UINT8 bta_dm_search_disc_active_st_table[][BTA_DM_SEARCH_NUM_COLS] = 
#if BLE_INCLUDED == TRUE

/* DISC_CLOSE_TOUT_EVT */   ,{BTA_DM_SEARCH_IGNORE,             BTA_DM_SEARCH_IGNORE,          BTA_DM_DISCOVER_ACTIVE}

#endif



};



typedef const UINT8 (*tBTA_DM_ST_TBL)[BTA_DM_SEARCH_NUM_COLS];