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

Commit 4b4cddda authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge redfin/bramble support."

parents 6512a3b5 c33e5258

TEST_MAPPING

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
      "name" : "net_test_stack_gatt_native",

      "host" : true

    },

    {

      "name" : "net_test_stack_a2dp_native",

      "host" : true

    },

    {

      "name" : "net_test_btif_config_cache",

      "host" : true

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#endif



#ifndef AVRCP_DEFAULT_VERSION

#define AVRCP_DEFAULT_VERSION AVRCP_1_4_STRING

#define AVRCP_DEFAULT_VERSION AVRCP_1_5_STRING

#endif



/* state machine states */

system/bta/dm/bta_dm_act.cc

+10 −0
Original line number Diff line number Diff line
@@ -3229,6 +3229,16 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
                       p_data->io_req.oob_data);

      break;



    case BTM_LE_CONSENT_REQ_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = BTM_SecReadDevName(bda);

      if (p_name != NULL)

        strlcpy((char*)sec_event.ble_req.bd_name, p_name, BD_NAME_LEN);

      else

        sec_event.ble_req.bd_name[0] = 0;

      bta_dm_cb.p_sec_cback(BTA_DM_BLE_CONSENT_REQ_EVT, &sec_event);

      break;



    case BTM_LE_SEC_REQUEST_EVT:

      sec_event.ble_req.bd_addr = bda;

      p_name = (bluetooth::shim::is_gd_security_enabled())

system/bta/include/bta_api.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ typedef uint8_t tBTA_DM_BLE_RSSI_ALERT_TYPE; 
                                    */

#define BTA_DM_ENER_INFO_READ 28 /* Energy info read */

#define BTA_DM_BLE_SC_OOB_REQ_EVT 29 /* SMP SC OOB request event */

#define BTA_DM_BLE_CONSENT_REQ_EVT 30 /* SMP consent request event */

typedef uint8_t tBTA_DM_SEC_EVT;



/* Structure associated with BTA_DM_PIN_REQ_EVT */

system/btif/include/btif_api.h

+12 −0
Original line number Diff line number Diff line
@@ -119,6 +119,18 @@ bool is_niap_mode(void); 
 ******************************************************************************/

int get_niap_config_compare_result(void);



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

 *

 * Function         is_atv_device

 *

 * Description      Returns true if the local device is an Android TV

 *                  device, false if it is not.

 *

 * Returns          bool

 *

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

bool is_atv_device(void);



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

 *

 * Function         btif_get_adapter_properties