Remove unnecessary #def BTIF_DM_LE_KEY_

=>BTM_LE_KEY_

BTM_LE_KEY_PENC == BTA_LE_KEY_PENC == BTIF_DM_LE_KEY_PENC
BTM_LE_KEY_PID == BTA_LE_KEY_PID == BTIF_DM_LE_KEY_PID
BTM_LE_KEY_PCSRK == BTA_LE_KEY_PCSRK == BTIF_DM_LE_KEY_PCSRK

BTM_LE_KEY_LENC == BTA_LE_KEY_LENC == BTIF_DM_LE_KEY_LENC
BTM_LE_KEY_LID == BTA_LE_KEY_LID == BTIF_DM_LE_KEY_LID
BTM_LE_KEY_LCSRK == BTA_LE_KEY_LCSRK == BTIF_DM_LE_KEY_LCSRK

Towards fewer aliases

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8e0acad049b7c5d816a5244825bcd0b9028e3a25

diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 6a99e5f..113f5dc 100644 (file)
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -2483,9 +2483,9 @@ void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr) {
   }
 
   if (pairing_cb.ble.is_pid_key_rcvd) {
-    btif_storage_add_ble_bonding_key(
-        &bd_addr, (uint8_t*)&pairing_cb.ble.pid_key, BTIF_DM_LE_KEY_PID,
-        sizeof(tBTM_LE_PID_KEYS));
+    btif_storage_add_ble_bonding_key(&bd_addr,
+                                     (uint8_t*)&pairing_cb.ble.pid_key,
+                                     BTM_LE_KEY_PID, sizeof(tBTM_LE_PID_KEYS));
   }
 
   if (pairing_cb.ble.is_pcsrk_key_rcvd) {

diff --git a/btif/src/btif_gatt_util.cc b/btif/src/btif_gatt_util.cc
index f0e7004..60ac18d 100644 (file)
--- a/btif/src/btif_gatt_util.cc
+++ b/btif/src/btif_gatt_util.cc
@@ -79,7 +79,7 @@ void btif_gatt_check_encrypted_link(RawAddress bd_addr,
                                     tBT_TRANSPORT transport_link) {
   tBTM_LE_PENC_KEYS key;
   if ((btif_storage_get_ble_bonding_key(
-           bd_addr, BTIF_DM_LE_KEY_PENC, (uint8_t*)&key,
+           bd_addr, BTM_LE_KEY_PENC, (uint8_t*)&key,
            sizeof(tBTM_LE_PENC_KEYS)) == BT_STATUS_SUCCESS) &&
       !btif_gatt_is_link_encrypted(bd_addr)) {
     BTIF_TRACE_DEBUG("%s: transport = %d", __func__, transport_link);

diff --git a/btif/src/btif_storage.cc b/btif/src/btif_storage.cc
index f88f8d1..0cb1246 100644 (file)
--- a/btif/src/btif_storage.cc
+++ b/btif/src/btif_storage.cc
@@ -879,7 +879,7 @@ static void remove_devices_with_sample_ltk() {
     memset(&key, 0, sizeof(key));
 
     if (btif_storage_get_ble_bonding_key(
-            bd_addr, BTIF_DM_LE_KEY_PENC, (uint8_t*)&key,
+            bd_addr, BTM_LE_KEY_PENC, (uint8_t*)&key,
             sizeof(tBTM_LE_PENC_KEYS)) == BT_STATUS_SUCCESS) {
       if (is_sample_ltk(key.penc_key.ltk)) {
         bad_ltk.push_back(bd_addr);
@@ -1050,22 +1050,22 @@ bt_status_t btif_storage_add_ble_bonding_key(RawAddress* remote_bd_addr,
                                              uint8_t key_length) {
   const char* name;
   switch (key_type) {
-    case BTIF_DM_LE_KEY_PENC:
+    case BTM_LE_KEY_PENC:
       name = "LE_KEY_PENC";
       break;
-    case BTIF_DM_LE_KEY_PID:
+    case BTM_LE_KEY_PID:
       name = "LE_KEY_PID";
       break;
-    case BTIF_DM_LE_KEY_PCSRK:
+    case BTM_LE_KEY_PCSRK:
       name = "LE_KEY_PCSRK";
       break;
-    case BTIF_DM_LE_KEY_LENC:
+    case BTM_LE_KEY_LENC:
       name = "LE_KEY_LENC";
       break;
-    case BTIF_DM_LE_KEY_LCSRK:
+    case BTM_LE_KEY_LCSRK:
       name = "LE_KEY_LCSRK";
       break;
-    case BTIF_DM_LE_KEY_LID:
+    case BTM_LE_KEY_LID:
       name = "LE_KEY_LID";
       break;
     default:
@@ -1093,22 +1093,22 @@ bt_status_t btif_storage_get_ble_bonding_key(const RawAddress& remote_bd_addr,
                                              int key_length) {
   const char* name;
   switch (key_type) {
-    case BTIF_DM_LE_KEY_PENC:
+    case BTM_LE_KEY_PENC:
       name = "LE_KEY_PENC";
       break;
-    case BTIF_DM_LE_KEY_PID:
+    case BTM_LE_KEY_PID:
       name = "LE_KEY_PID";
       break;
-    case BTIF_DM_LE_KEY_PCSRK:
+    case BTM_LE_KEY_PCSRK:
       name = "LE_KEY_PCSRK";
       break;
-    case BTIF_DM_LE_KEY_LENC:
+    case BTM_LE_KEY_LENC:
       name = "LE_KEY_LENC";
       break;
-    case BTIF_DM_LE_KEY_LCSRK:
+    case BTM_LE_KEY_LCSRK:
       name = "LE_KEY_LCSRK";
       break;
-    case BTIF_DM_LE_KEY_LID:
+    case BTM_LE_KEY_LID:
       name = "LE_KEY_LID";
       break;
     default:
@@ -1260,22 +1260,22 @@ static bt_status_t btif_in_fetch_bonded_ble_device(
       btif_storage_set_remote_addr_type(&bd_addr, BLE_ADDR_PUBLIC);
     }
 
-    btif_read_le_key(BTIF_DM_LE_KEY_PENC, sizeof(tBTM_LE_PENC_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_PENC, sizeof(tBTM_LE_PENC_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
-    btif_read_le_key(BTIF_DM_LE_KEY_PID, sizeof(tBTM_LE_PID_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_PID, sizeof(tBTM_LE_PID_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
-    btif_read_le_key(BTIF_DM_LE_KEY_LID, sizeof(tBTM_LE_PID_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_LID, sizeof(tBTM_LE_PID_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
-    btif_read_le_key(BTIF_DM_LE_KEY_PCSRK, sizeof(tBTM_LE_PCSRK_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_PCSRK, sizeof(tBTM_LE_PCSRK_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
-    btif_read_le_key(BTIF_DM_LE_KEY_LENC, sizeof(tBTM_LE_LENC_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_LENC, sizeof(tBTM_LE_LENC_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
-    btif_read_le_key(BTIF_DM_LE_KEY_LCSRK, sizeof(tBTM_LE_LCSRK_KEYS), bd_addr,
+    btif_read_le_key(BTM_LE_KEY_LCSRK, sizeof(tBTM_LE_LCSRK_KEYS), bd_addr,
                      addr_type, add, &device_added, &key_found);
 
     // Fill in the bonded devices