Merge pull request #243 in NAR/sdl-core from fix/remove_device_id_from_protocol_layer to feature/Ford-WiFi

* commit 'acc25986110b72465268736495b29812db2a3a0a':
  fully revert info.h
  use connection_type instead of device_id in the protocol layer for secondary transports

1 files changed, 2 insertions, 38 deletions

diff --git a/src/components/include/transport_manager/info.h b/src/components/include/transport_manager/info.h
index 96759bf208..fb06b39045 100644
--- a/src/components/include/transport_manager/info.h
+++ b/src/components/include/transport_manager/info.h
@@ -38,7 +38,6 @@
 
 #include <string>
 #include "transport_manager/common.h"
-#include "transport_manager/transport_adapter/transport_adapter.h"
 
 /**
  * @brief transport_manager name space
@@ -101,49 +100,22 @@ class DeviceInfo : public Info {
    */
   ConnectionType connection_type_;
 
-  /**
-   * @brief The type of the device.
-   */
-  transport_manager::transport_adapter::DeviceType device_type_;
-
  public:
   /**
    * @brief Constructor.
    *
    * @param device_handle Handle of device.
    * @param mac_address MAC address of device.
-   * @param connection_type Connection Type string
    * @param name Name of device.
    */
-  DEPRECATED DeviceInfo(DeviceHandle device_handle,
-             std::string mac_address,
-             std::string name,
-             const ConnectionType& connection_type)
-      : Info(name)
-      , mac_address_(mac_address)
-      , device_handle_(device_handle)
-      , connection_type_(connection_type)
-      , device_type_(transport_manager::transport_adapter::DeviceType::UNKNOWN) {}
-
-  /**
-   * @brief Constructor.
-   *
-   * @param device_handle Handle of device.
-   * @param mac_address MAC address of device.
-   * @param name Name of device.
-   * @param connection_type Connection Type string
-   * @param device_type Device Type of the Device
-   */
   DeviceInfo(DeviceHandle device_handle,
              std::string mac_address,
              std::string name,
-             const ConnectionType& connection_type,
-             transport_manager::transport_adapter::DeviceType device_type)
+             const ConnectionType& connection_type)
       : Info(name)
       , mac_address_(mac_address)
       , device_handle_(device_handle)
-      , connection_type_(connection_type)
-      , device_type_(device_type) {}
+      , connection_type_(connection_type) {}
 
   /**
    * @brief Return mac_address.
@@ -168,14 +140,6 @@ class DeviceInfo : public Info {
   }
 
   /**
-   * @brief Return device_type_.
-   * @return
-   */
-  transport_manager::transport_adapter::DeviceType device_type() const {
-    return device_type_;
-  }
-
-  /**
    * @brief Overloaded operator "==".
    */
   friend bool operator==(const DeviceInfo& first, const DeviceInfo& second);