Update to HMIOriginID

5 files changed, 13 insertions, 13 deletions

diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini
index 54a86113a3..954381afeb 100644
--- a/src/appMain/smartDeviceLink.ini
+++ b/src/appMain/smartDeviceLink.ini
@@ -372,7 +372,7 @@ EnableAppLaunchIOS = true
 
 [AppServices]
 ; The ID to pass to app service publishers when sending a PerformAppServiceInteraction request
-CoresOriginId = "sdl_core"
+HMIOriginID = "HMI_ID"
 
 ; Services that exist on the module. Values are of AppServiceType in RPC Spec. These services will be used as default and app services will only become primary service publisher with direct user interaction. These services will also be a fallback if no app service publisher is registered with the system of that type.
 EmbeddedServices = MEDIA, WEATHER, NAVIGATION, VOICE_ASSISTANT
diff --git a/src/components/config_profile/include/config_profile/profile.h b/src/components/config_profile/include/config_profile/profile.h
index 1d3882d88b..02fff3764b 100644
--- a/src/components/config_profile/include/config_profile/profile.h
+++ b/src/components/config_profile/include/config_profile/profile.h
@@ -527,7 +527,7 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   const std::vector<std::string>& video_service_transports() const OVERRIDE;
 
   const std::vector<std::string>& embedded_services() const OVERRIDE;
-  const std::string cores_origin_id() const OVERRIDE;
+  const std::string hmi_origin_id() const OVERRIDE;
   /**
    * @brief Reads a string value from the profile
    *
@@ -1068,7 +1068,7 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
 
   std::vector<std::string> embedded_services_;
 
-  std::string cores_origin_id_;
+  std::string hmi_origin_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Profile);
 };
diff --git a/src/components/config_profile/src/profile.cc b/src/components/config_profile/src/profile.cc
index 27c45d19ca..5a6d3b3808 100644
--- a/src/components/config_profile/src/profile.cc
+++ b/src/components/config_profile/src/profile.cc
@@ -285,7 +285,7 @@ const char* kProjectionLowBandwidthResumptionLevelKey =
     "ProjectionLowBandwidthResumptionLevel";
 const char* kMediaLowBandwidthResumptionLevelKey =
     "MediaLowBandwidthResumptionLevel";
-const char* kCoresOriginIdKey = "CoresOriginId";
+const char* kHMIOriginIDKey = "HMIOriginID";
 const char* kEmbeddedServicesKey = "EmbeddedServices";
 
 #ifdef WEB_HMI
@@ -394,7 +394,7 @@ const std::string kAllowedSymbols =
     "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-";
 const bool kDefaultMultipleTransportsEnabled = false;
 const char* kDefaultLowBandwidthResumptionLevel = "NONE";
-const char* kDefaultCoresOriginId = "sdl_core";
+const char* kDefaultHMIOriginId = "HMI_ID";
 }  // namespace
 
 namespace profile {
@@ -1122,8 +1122,8 @@ const std::vector<std::string>& Profile::embedded_services() const {
   return embedded_services_;
 }
 
-const std::string Profile::cores_origin_id() const {
-  return cores_origin_id_;
+const std::string Profile::hmi_origin_id() const {
+  return hmi_origin_id_;
 }
 
 void Profile::UpdateValues() {
@@ -2291,12 +2291,12 @@ void Profile::UpdateValues() {
     }
   }
 
-  ReadStringValue(&cores_origin_id_,
-                  kDefaultCoresOriginId,
+  ReadStringValue(&hmi_origin_id_,
+                  kDefaultHMIOriginId,
                   kAppServicesSection,
-                  kCoresOriginIdKey);
+                  kHMIOriginIDKey);
 
-  LOG_UPDATED_VALUE(cores_origin_id_, kCoresOriginIdKey, kAppServicesSection);
+  LOG_UPDATED_VALUE(hmi_origin_id_, kHMIOriginIDKey, kAppServicesSection);
 
   {  // App Services map
     struct KeyPair {
diff --git a/src/components/include/application_manager/application_manager_settings.h b/src/components/include/application_manager/application_manager_settings.h
index 3e9830b202..a48d0ecc63 100644
--- a/src/components/include/application_manager/application_manager_settings.h
+++ b/src/components/include/application_manager/application_manager_settings.h
@@ -110,7 +110,7 @@ class ApplicationManagerSettings : public RequestControlerSettings,
   virtual const uint32_t& list_files_response_size() const = 0;
   virtual const std::string& plugins_folder() const = 0;
   virtual const std::vector<std::string>& embedded_services() const = 0;
-  virtual const std::string cores_origin_id() const = 0;
+  virtual const std::string hmi_origin_id() const = 0;
 };
 
 }  // namespace application_manager
diff --git a/src/components/include/test/application_manager/mock_application_manager_settings.h b/src/components/include/test/application_manager/mock_application_manager_settings.h
index 392b5a0ab3..b95a219111 100644
--- a/src/components/include/test/application_manager/mock_application_manager_settings.h
+++ b/src/components/include/test/application_manager/mock_application_manager_settings.h
@@ -139,7 +139,7 @@ class MockApplicationManagerSettings
 
   // AppServices
   MOCK_CONST_METHOD0(embedded_services, const std::vector<std::string>&());
-  MOCK_CONST_METHOD0(cores_origin_id, const std::string());
+  MOCK_CONST_METHOD0(hmi_origin_id, const std::string());
 };
 
 }  // namespace application_manager_test