Remove redundant functionality

3 files changed, 18 insertions, 6 deletions

diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
index 66478c60ac..7f6d347535 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
@@ -59,8 +59,19 @@ class TransportAdapterListener;
 /**
  * @brief The DeviceType enum defines types based on available transport
  * adapters
+ * @deprecated PASA_AOA, PASA_BLUETOOTH, MME
  */
-enum DeviceType { AOA, BLUETOOTH, IOS_BT, IOS_USB, TCP, UNKNOWN };
+enum DeviceType {
+  AOA,
+  PASA_AOA,
+  BLUETOOTH,
+  PASA_BLUETOOTH,
+  MME,
+  IOS_BT,
+  IOS_USB,
+  TCP,
+  UNKNOWN
+};
 
 typedef std::map<DeviceType, std::string> DeviceTypes;
 
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index caacaaaa68..9fb0921c4b 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -45,11 +45,15 @@ namespace transport_adapter {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 namespace {
+// @deprecated DeviceTypes: PASA_AOA, PASA_BLUETOOTH, MME
 DeviceTypes devicesType = {
     std::make_pair(DeviceType::AOA, std::string("USB_AOA")),
-    std::make_pair(DeviceType::IOS_USB, std::string("USB_IOS")),
-    std::make_pair(DeviceType::IOS_BT, std::string("BLUETOOTH_IOS")),
+    std::make_pair(DeviceType::PASA_AOA, std::string("USB_AOA")),
     std::make_pair(DeviceType::BLUETOOTH, std::string("BLUETOOTH")),
+    std::make_pair(DeviceType::PASA_BLUETOOTH, std::string("BLUETOOTH")),
+    std::make_pair(DeviceType::MME, std::string("USB_IOS")),
+    std::make_pair(DeviceType::IOS_BT, std::string("BLUETOOTH_IOS")),
+    std::make_pair(DeviceType::IOS_USB, std::string("USB_IOS")),
     std::make_pair(DeviceType::TCP, std::string("WIFI"))};
 }
 
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index 1592373809..03e6bd58f6 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -823,11 +823,8 @@ void TransportManagerImpl::TryDeviceSwitch(
   bt_adapter->StopDevice(bt_uid);
   adapter->DeviceSwitched(usb_uid);
 
-  // TODO(AOleynik): Check if next line functionality is still needed
   DeactivateDeviceConnections(bt_uid);
 
-  // TODO(AOleynik): Check if next line functionality is still needed
-  device_to_switch->second = adapter;
   device_to_reconnect_ = bt_uid;
 
   const uint32_t timeout = get_settings().app_transport_change_timer() +