Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE

Towards the shortest path

Bug: 163134718
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I9475559159475f9f9d81a921cf14c2db62be3839

diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index fc97b02..c52188a 100644 (file)
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -3206,8 +3206,8 @@ static void bta_dm_observe_cmpl_cb(void* p_result) {
 
 static void ble_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,
                        tBTM_OOB_DATA* p_oob_data, tBTM_LE_AUTH_REQ* p_auth_req,
-                       uint8_t* p_max_key_size, tBTA_LE_KEY_TYPE* p_init_key,
-                       tBTA_LE_KEY_TYPE* p_resp_key) {
+                       uint8_t* p_max_key_size, tBTM_LE_KEY_TYPE* p_init_key,
+                       tBTM_LE_KEY_TYPE* p_resp_key) {
   bte_appl_cfg.ble_io_cap = btif_storage_get_local_io_caps_ble();
 
   /* Retrieve the properties from file system if possible */
@@ -3423,7 +3423,7 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type,
  *
  ******************************************************************************/
 void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey,
-                       tBTA_LE_KEY_TYPE key_type) {
+                       tBTM_LE_KEY_TYPE key_type) {
   if (!BTM_SecAddBleKey(bd_addr, (tBTM_LE_KEY_VALUE*)&blekey, key_type)) {
     LOG(ERROR) << "BTA_DM: Error adding BLE Key for device " << bd_addr;
   }

diff --git a/bta/dm/bta_dm_api.cc b/bta/dm/bta_dm_api.cc
index 5c86aca..d0a5839 100644 (file)
--- a/bta/dm/bta_dm_api.cc
+++ b/bta/dm/bta_dm_api.cc
@@ -363,7 +363,7 @@ tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
  *
  ******************************************************************************/
 void BTA_DmAddBleKey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE* p_le_key,
-                     tBTA_LE_KEY_TYPE key_type) {
+                     tBTM_LE_KEY_TYPE key_type) {
   do_in_main_thread(
       FROM_HERE, base::Bind(bta_dm_add_blekey, bd_addr, *p_le_key, key_type));
 }

diff --git a/bta/dm/bta_dm_int.h b/bta/dm/bta_dm_int.h
index d6de1cc..33740b0 100644 (file)
--- a/bta/dm/bta_dm_int.h
+++ b/bta/dm/bta_dm_int.h
@@ -434,7 +434,7 @@ extern void bta_dm_add_ampkey(tBTA_DM_MSG* p_data);
 
 extern void bta_dm_add_blekey(const RawAddress& bd_addr,
                               tBTA_LE_KEY_VALUE blekey,
-                              tBTA_LE_KEY_TYPE key_type);
+                              tBTM_LE_KEY_TYPE key_type);
 extern void bta_dm_add_ble_device(const RawAddress& bd_addr,
                                   tBLE_ADDR_TYPE addr_type,
                                   tBT_DEVICE_TYPE dev_type);

diff --git a/bta/include/bta_api.h b/bta/include/bta_api.h
index 3550891..557e3e1 100644 (file)
--- a/bta/include/bta_api.h
+++ b/bta/include/bta_api.h
@@ -968,7 +968,7 @@ extern void BTA_DmAddBleDevice(const RawAddress& bd_addr,
  ******************************************************************************/
 extern void BTA_DmAddBleKey(const RawAddress& bd_addr,
                             tBTA_LE_KEY_VALUE* p_le_key,
-                            tBTA_LE_KEY_TYPE key_type);
+                            tBTM_LE_KEY_TYPE key_type);
 
 /*******************************************************************************
  *

diff --git a/bta/include/bta_dm_co.h b/bta/include/bta_dm_co.h
index c9662c7..4c3f5c7 100644 (file)
--- a/bta/include/bta_dm_co.h
+++ b/bta/include/bta_dm_co.h
@@ -177,7 +177,7 @@ extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status);
 extern void bta_dm_co_ble_io_req(
     const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, tBTM_OOB_DATA* p_oob_data,
     tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,
-    tBTA_LE_KEY_TYPE* p_init_key, tBTA_LE_KEY_TYPE* p_resp_key);
+    tBTM_LE_KEY_TYPE* p_init_key, tBTM_LE_KEY_TYPE* p_resp_key);
 
 /*******************************************************************************
  *