diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index e9498979212d21cdd4b5799edf9a10492110d49e..938b2986aae40547070bc93ed97e5101d5f11221 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -731,7 +731,6 @@ typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr,
 #define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM
 #define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM
 
-typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;
 typedef tBTM_BLE_IDLE_TIME_MS tBTA_DM_BLE_IDLE_TIME_MS;
 
 #define BTA_DM_CONTRL_UNKNOWN 0 /* Unknown state */
@@ -751,7 +750,7 @@ typedef uint8_t tBTA_DM_BLE_RSSI_VALUE;
 typedef uint16_t tBTA_DM_BLE_ADV_INFO_TIMESTAMP;
 
 typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTM_BLE_TX_TIME_MS tx_time,
-                                         tBTA_DM_BLE_RX_TIME_MS rx_time,
+                                         tBTM_BLE_RX_TIME_MS rx_time,
                                          tBTA_DM_BLE_IDLE_TIME_MS idle_time,
                                          tBTM_BLE_ENERGY_USED energy_used,
                                          tBTA_DM_CONTRL_STATE ctrl_state,
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 5353758e947e7e493d8a46e67df92d9b0d349220..8c0cab8eaa62f03e787a6823ef157734d410f4a2 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -2167,7 +2167,7 @@ static void bte_dm_remote_service_record_evt(tBTA_DM_SEARCH_EVT event,
  *
  ******************************************************************************/
 static void bta_energy_info_cb(tBTM_BLE_TX_TIME_MS tx_time,
-                               tBTA_DM_BLE_RX_TIME_MS rx_time,
+                               tBTM_BLE_RX_TIME_MS rx_time,
                                tBTA_DM_BLE_IDLE_TIME_MS idle_time,
                                tBTM_BLE_ENERGY_USED energy_used,
                                tBTA_DM_CONTRL_STATE ctrl_state,