Avoid integer overflow

Replaced all usaged of device handle with apropriate typedef
Assignment device handle to uint32_t leads to integer overflow

2 files changed, 4 insertions, 2 deletions

diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index dc16e14023..fc84538dae 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -46,6 +46,7 @@
 #include "protocol_handler/session_observer.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "smart_objects/smart_object.h"
+#include "transport_manager/common.h"
 
 namespace policy {
 class PolicyHandlerInterface;
@@ -137,7 +138,8 @@ class MessageHelper {
       mobile_apis::Result::eType mobile_result);
 
   static std::string GetDeviceMacAddressForHandle(
-      const uint32_t device_handle, const ApplicationManager& app_mngr);
+      const transport_manager::DeviceHandle device_handle,
+      const ApplicationManager& app_mngr);
   /**
    * @brief Converts string to mobile Result enum value
    * @param mobile_result stringified value
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index ce5c0818f1..b4653c6cb2 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -67,7 +67,7 @@ class ApplicationManager;
 namespace policy {
 
 typedef std::vector<uint32_t> AppIds;
-typedef std::vector<uint32_t> DeviceHandles;
+typedef std::vector<transport_manager::DeviceHandle> DeviceHandles;
 namespace custom_str = utils::custom_string;
 
 class PolicyHandler : public PolicyHandlerInterface,