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

Commit 33b6d6f2 authored by Chris Manton's avatar Chris Manton
Browse files

Remove useless bta_dm_authentication_complete_cback return value 

Toward meaningful code

Bug: 163134718
Test: gd/cert/run
Tag: #refactor

Change-Id: I55fea00a20a23ed917c00255cd992a0ad3eab86f
parent 033df4fd

system/bta/dm/bta_dm_act.cc

+4 −7
Original line number Diff line number Diff line
@@ -74,10 +74,9 @@ static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class, 
static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dev_class, BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type);

static uint8_t bta_dm_authentication_complete_cback(const RawAddress& bd_addr,

static void bta_dm_authentication_complete_cback(const RawAddress& bd_addr,

                                                 DEV_CLASS dev_class,

                                                    BD_NAME bd_name,

                                                    int result);

                                                 BD_NAME bd_name, int result);

static void bta_dm_local_name_cback(void* p_name);

static void bta_dm_check_av();
@@ -2058,7 +2057,7 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr, 
 * Returns          void

 *

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

static uint8_t bta_dm_authentication_complete_cback(

static void bta_dm_authentication_complete_cback(

    const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class, BD_NAME bd_name,

    int result) {

  tBTA_DM_SEC sec_event;
@@ -2086,8 +2085,6 @@ static uint8_t bta_dm_authentication_complete_cback( 
      bta_dm_remove_sec_dev_entry(bd_addr);

    }

  }



  return BTM_SUCCESS;

}



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

system/stack/include/btm_api_types.h

+3 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ typedef void(tBTM_RMT_NAME_CALLBACK)(const RawAddress& bd_addr, DEV_CLASS dc, 
 *              BD Name of remote

 *

*/

typedef uint8_t(tBTM_AUTH_COMPLETE_CALLBACK)(const RawAddress& bd_addr,

typedef void(tBTM_AUTH_COMPLETE_CALLBACK)(const RawAddress& bd_addr,

                                          DEV_CLASS dev_class,

                                          tBTM_BD_NAME bd_name, int result);