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

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

Merge "Use proper search state bta::tBTA_DM_STATE" am: 815ada3a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2290558



Change-Id: I1d0c69e7b815a434f7e97d67d5527ad84630c968
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1dad2f6 815ada3a

system/bta/dm/bta_dm_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -289,8 +289,10 @@ void bta_dm_enable(tBTA_DM_SEC_CBACK* p_sec_cback) { 
  btm_local_io_caps = btif_storage_get_local_io_caps();

}



void bta_dm_search_set_state(uint8_t state) { bta_dm_search_cb.state = state; }

uint8_t bta_dm_search_get_state() { return bta_dm_search_cb.state; }

void bta_dm_search_set_state(tBTA_DM_STATE state) {

  bta_dm_search_cb.state = state;

}

tBTA_DM_STATE bta_dm_search_get_state() { return bta_dm_search_cb.state; }



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

 *

system/bta/dm/bta_dm_int.h

+24 −24
Original line number Diff line number Diff line
@@ -357,6 +357,27 @@ typedef struct { 
  alarm_t* switch_delay_timer;

} tBTA_DM_CB;



/* DM search state */

typedef enum {



  BTA_DM_SEARCH_IDLE,

  BTA_DM_SEARCH_ACTIVE,

  BTA_DM_SEARCH_CANCELLING,

  BTA_DM_DISCOVER_ACTIVE



} tBTA_DM_STATE;



inline std::string bta_dm_state_text(const tBTA_DM_STATE& state) {

  switch (state) {

    CASE_RETURN_TEXT(BTA_DM_SEARCH_IDLE);

    CASE_RETURN_TEXT(BTA_DM_SEARCH_ACTIVE);

    CASE_RETURN_TEXT(BTA_DM_SEARCH_CANCELLING);

    CASE_RETURN_TEXT(BTA_DM_DISCOVER_ACTIVE);

    default:

      return base::StringPrintf("UNKNOWN[%d]", state);

  }

}



/* DM search control block */

typedef struct {

  tBTA_DM_SEARCH_CBACK* p_search_cback;
@@ -365,7 +386,7 @@ typedef struct { 
  tBTA_SERVICE_MASK services_to_search;

  tBTA_SERVICE_MASK services_found;

  tSDP_DISCOVERY_DB* p_sdp_db;

  uint16_t state;

  tBTA_DM_STATE state;

  RawAddress peer_bdaddr;

  bool name_discover_done;

  BD_NAME peer_name;
@@ -396,27 +417,6 @@ typedef struct { 
                                         is primary record */

} tBTA_DM_DI_CB;



/* DM search state */

typedef enum {



  BTA_DM_SEARCH_IDLE,

  BTA_DM_SEARCH_ACTIVE,

  BTA_DM_SEARCH_CANCELLING,

  BTA_DM_DISCOVER_ACTIVE



} tBTA_DM_STATE;



inline std::string bta_dm_state_text(const tBTA_DM_STATE& state) {

  switch (state) {

    CASE_RETURN_TEXT(BTA_DM_SEARCH_IDLE);

    CASE_RETURN_TEXT(BTA_DM_SEARCH_ACTIVE);

    CASE_RETURN_TEXT(BTA_DM_SEARCH_CANCELLING);

    CASE_RETURN_TEXT(BTA_DM_DISCOVER_ACTIVE);

    default:

      return base::StringPrintf("UNKNOWN[%d]", state);

  }

}



typedef struct {

  uint16_t page_timeout; /* timeout for page in slots */

  bool avoid_scatter; /* true to avoid scatternet when av is streaming (be the
@@ -591,8 +591,8 @@ extern void bta_dm_set_event_filter_inquiry_result_all_devices(); 


extern void bta_dm_ble_reset_id(void);



uint8_t bta_dm_search_get_state();

void bta_dm_search_set_state(uint8_t state);

tBTA_DM_STATE bta_dm_search_get_state();

void bta_dm_search_set_state(tBTA_DM_STATE state);



void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);

void bta_dm_eir_update_cust_uuid(const tBTA_CUSTOM_UUID &curr, bool adding);