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

Commit d109ba76 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Remove useless typedefs am: e6f76ea5 am: a7519cbe am: 88aa7338 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1642917

Change-Id: I11e34c7a6d6672f844dbbff88c32a9309ffb2873
parents 878700c2 88aa7338

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ bool BTA_DmGetConnectionState(const RawAddress& bd_addr) { 
 * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.

 *

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

tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,

tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

                                   uint32_t* p_handle) {

  tBTA_STATUS status = BTA_FAILURE;

system/bta/include/bta_api.h

+1 −7
Original line number Diff line number Diff line
@@ -627,12 +627,6 @@ enum { 


/* Device Identification (DI) data structure

*/

/* Used to set the DI record */

typedef tSDP_DI_RECORD tBTA_DI_RECORD;

/* Used to get the DI record */

typedef tSDP_DI_GET_RECORD tBTA_DI_GET_RECORD;

/* SDP discovery database */

typedef tSDP_DISCOVERY_DB tBTA_DISCOVERY_DB;



#ifndef BTA_DI_NUM_MAX

#define BTA_DI_NUM_MAX 3
@@ -910,7 +904,7 @@ extern bool BTA_DmGetConnectionState(const RawAddress& bd_addr); 
 * Returns          BTA_SUCCESS if record set sucessfully, otherwise error code.

 *

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

extern tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,

extern tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

                                          uint32_t* p_handle);



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

system/main/bte_conf.cc

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void bte_load_did_conf(const char* p_path) { 
      break;

    }



    tBTA_DI_RECORD record;

    tSDP_DI_RECORD record;

    record.vendor =

        config_get_int(*config, section_name, "vendorId", LMP_COMPID_GOOGLE);

    record.vendor_id_source = config_get_int(

system/test/mock/mock_bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ tBTA_STATUS BTA_DmRemoveDevice(const RawAddress& bd_addr) { 
  mock_function_count_map[__func__]++;

  return BTA_SUCCESS;

}

tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,

tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

                                   uint32_t* p_handle) {

  mock_function_count_map[__func__]++;

  return BTA_SUCCESS;