diff options
24 files changed, 87 insertions, 87 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c34c86e646..0f655332c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) option(USE_DISTCC "Turn on distributed build_usage" ON) -set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTENDED_PROPRIETARY)") +set (EXTENDED_POLICY "${EXTENDED_POLICY}" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)") if(EXTENDED_POLICY STREQUAL "") set(EXTENDED_POLICY "PROPRIETARY") endif() @@ -281,12 +281,12 @@ if (TELEMETRY_MONITOR) add_definitions(-DTELEMETRY_MONITOR) endif() -if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY") - add_definitions(-DEXTENDED_PROPRIETARY) +if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") + add_definitions(-DEXTERNAL_PROPRIETARY) set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_premium/) set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_premium/) set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_premium/) - message(STATUS "DEFINED EXTENDED_PROPRIETARY") + message(STATUS "DEFINED EXTERNAL_PROPRIETARY") else() if (${EXTENDED_POLICY} STREQUAL "PROPRIETARY") add_definitions(-DEXTENDED_POLICY) diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt index 7ef2aa1aae..04bd38d8f1 100644 --- a/src/components/CMakeLists.txt +++ b/src/components/CMakeLists.txt @@ -60,7 +60,7 @@ if(ENABLE_SECURITY) endif() -if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY") +if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") add_subdirectory(./policy/policy_premium/) message(STATUS "Use premium policy") else() diff --git a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h index cca848e184..008bd72bc1 100644 --- a/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/delegates/app_permission_delegate.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #include "application_manager/policies/premium/delegates/app_permission_delegate.h" #else #include "application_manager/policies/regular/delegates/app_permission_delegate.h" diff --git a/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h b/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h index a415b3037e..2acfcd0e47 100644 --- a/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h +++ b/src/components/application_manager/include/application_manager/policies/delegates/statistics_delegate.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #include "application_manager/policies/premium/delegates/statistics_delegate.h" #else #include "application_manager/policies/regular/delegates/statistics_delegate.h" diff --git a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h index 99ed20b69f..dd863ec450 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_event_observer.h +++ b/src/components/application_manager/include/application_manager/policies/policy_event_observer.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #include "application_manager/policies/premium/policy_event_observer.h" #else #include "application_manager/policies/regular/policy_event_observer.h" 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 06fca0eec8..dc69055d4e 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 @@ -92,13 +92,13 @@ class PolicyHandler : public PolicyHandlerInterface, virtual void OnPermissionsUpdated(const std::string& policy_app_id, const Permissions& permissions) OVERRIDE; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void OnSnapshotCreated(const BinaryMessage& pt_string, const std::vector<int>& retry_delay_seconds, int timeout_exchange) OVERRIDE; -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY void OnSnapshotCreated(const BinaryMessage& pt_string) OVERRIDE; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY virtual bool GetPriority(const std::string& policy_app_id, std::string* priority) const OVERRIDE; void CheckPermissions(const PTString& app_id, @@ -307,9 +307,9 @@ class PolicyHandler : public PolicyHandlerInterface, virtual void OnCertificateUpdated( const std::string& certificate_data) OVERRIDE; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void OnCertificateDecrypted(bool is_succeeded) OVERRIDE; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY virtual bool CanUpdate() OVERRIDE; virtual void OnDeviceConsentChanged(const std::string& device_id, @@ -398,13 +398,13 @@ class PolicyHandler : public PolicyHandlerInterface, */ const VehicleInfo GetVehicleInfo() const OVERRIDE; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY /** * @brief Gets meta information * @return meta information */ const policy::MetaInfo GetMetaInfo() const OVERRIDE; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY // TODO(AKutsan) REMOVE THIS UGLY HOTFIX virtual void Increment(usage_statistics::GlobalCounterId type) OVERRIDE; @@ -506,9 +506,9 @@ class PolicyHandler : public PolicyHandlerInterface, private: PolicyHandler* policy_handler_; }; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void OnEmptyCertificateArrived() const; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY bool SaveSnapshot(const BinaryMessage& pt_string, std::string& snap_path); static const std::string kLibrary; mutable sync_primitives::RWLock policy_manager_lock_; diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h b/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h index 81d8db63dc..99ed25b4bf 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h +++ b/src/components/application_manager/include/application_manager/policies/policy_handler_observer.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #error "policy_handler_observer.h is not available in policy premium" #else #include "application_manager/policies/regular/policy_handler_observer.h" diff --git a/src/components/application_manager/include/application_manager/policies/policy_retry_sequence.h b/src/components/application_manager/include/application_manager/policies/policy_retry_sequence.h index 81d8db63dc..99ed25b4bf 100644 --- a/src/components/application_manager/include/application_manager/policies/policy_retry_sequence.h +++ b/src/components/application_manager/include/application_manager/policies/policy_retry_sequence.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #error "policy_handler_observer.h is not available in policy premium" #else #include "application_manager/policies/regular/policy_handler_observer.h" diff --git a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler.h b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler.h index 765e5343c2..d5b91b7e75 100644 --- a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler.h +++ b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #error "pt_exchange_handler.h is not available in policy premium" #else #include "application_manager/policies/regular/pt_exchange_handler.h" diff --git a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_ext.h b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_ext.h index 59f8714402..c4aec46a70 100644 --- a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_ext.h +++ b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_ext.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #error "pt_exchange_handler_ext.h is not available in policy premium" #else #include "application_manager/policies/regular/pt_exchange_handler_ext.h" diff --git a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_impl.h b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_impl.h index 106bfaccef..2b510ea73d 100644 --- a/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_impl.h +++ b/src/components/application_manager/include/application_manager/policies/pt_exchange_handler_impl.h @@ -1,4 +1,4 @@ -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #error "pt_exchange_handler_impl.h is not available in policy premium" #else #include "application_manager/policies/regular/pt_exchange_handler_impl.h" diff --git a/src/components/application_manager/src/commands/hmi/decrypt_certificate_response.cc b/src/components/application_manager/src/commands/hmi/decrypt_certificate_response.cc index 7b1580521d..3f0a95787f 100644 --- a/src/components/application_manager/src/commands/hmi/decrypt_certificate_response.cc +++ b/src/components/application_manager/src/commands/hmi/decrypt_certificate_response.cc @@ -32,7 +32,7 @@ #include "application_manager/commands/hmi/decrypt_certificate_response.h" #include "application_manager/policies/policy_handler.h" -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY namespace application_manager { namespace commands { @@ -56,4 +56,4 @@ void DecryptCertificateResponse::Run() { } // namespace commands } // namespace application_manager -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY diff --git a/src/components/application_manager/src/commands/hmi/get_urls.cc b/src/components/application_manager/src/commands/hmi/get_urls.cc index ea52325174..1285808fbf 100644 --- a/src/components/application_manager/src/commands/hmi/get_urls.cc +++ b/src/components/application_manager/src/commands/hmi/get_urls.cc @@ -95,9 +95,9 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) { service_info[strings::url] = app_url; if (policy::kDefaultId != endpoints[e].app_id) { -#ifndef EXTENDED_PROPRIETARY +#ifndef EXTERNAL_PROPRIETARY service_info[hmi_response::policy_app_id] = endpoints[e].app_id; -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY ApplicationSharedPtr app = application_manager_.application_by_policy_id(endpoints[e].app_id); @@ -110,7 +110,7 @@ void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) { } service_info[strings::app_id] = app->hmi_app_id(); -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } } } diff --git a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc index c67158bab6..9d3dde0f84 100644 --- a/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/on_received_policy_update.cc @@ -47,7 +47,7 @@ OnReceivedPolicyUpdate::~OnReceivedPolicyUpdate() {} void OnReceivedPolicyUpdate::Run() { LOG4CXX_AUTO_TRACE(logger_); -#if defined(EXTENDED_POLICY) || defined(EXTENDED_PROPRIETARY) +#if defined(EXTENDED_POLICY) || defined(EXTERNAL_PROPRIETARY) const std::string& file_path = (*message_)[strings::msg_params][hmi_notification::policyfile].asString(); policy::BinaryMessage file_content; diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc index a6dbb2dc71..2994ed7330 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc @@ -98,7 +98,7 @@ uint32_t SDLActivateAppRequest::app_id() const { return (*message_)[msg_params][strings::app_id].asUInt(); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void SDLActivateAppRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); using namespace hmi_apis::FunctionID; @@ -118,7 +118,7 @@ void SDLActivateAppRequest::Run() { } } -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY void SDLActivateAppRequest::Run() { LOG4CXX_AUTO_TRACE(logger_); using namespace hmi_apis::FunctionID; @@ -195,7 +195,7 @@ void SDLActivateAppRequest::Run() { subscribe_on_event(BasicCommunication_OnAppRegistered); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY void SDLActivateAppRequest::onTimeOut() { using namespace hmi_apis::FunctionID; using namespace hmi_apis::Common_Result; diff --git a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc index a0a42aa1a5..6c3001f7a5 100644 --- a/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc +++ b/src/components/application_manager/src/commands/hmi/sdl_policy_update.cc @@ -44,7 +44,7 @@ SDLPolicyUpdate::~SDLPolicyUpdate() {} void SDLPolicyUpdate::Run() { LOG4CXX_AUTO_TRACE(logger_); -#if defined(EXTENDED_POLICY) || defined(EXTENDED_PROPRIETARY) +#if defined(EXTENDED_POLICY) || defined(EXTERNAL_PROPRIETARY) SendRequest(); #else LOG4CXX_WARN(logger_, diff --git a/src/components/application_manager/src/hmi_command_factory.cc b/src/components/application_manager/src/hmi_command_factory.cc index 77963d0aea..599abb2536 100644 --- a/src/components/application_manager/src/hmi_command_factory.cc +++ b/src/components/application_manager/src/hmi_command_factory.cc @@ -157,10 +157,10 @@ #include "application_manager/commands/hmi/on_app_permission_changed_notification.h" #include "application_manager/commands/hmi/on_event_changed_notification.h" -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY #include "application_manager/commands/hmi/decrypt_certificate_request.h" #include "application_manager/commands/hmi/decrypt_certificate_response.h" -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY #ifdef HMI_DBUS_API #include "application_manager/commands/hmi/vi_get_vehicle_data_request_template.h" @@ -333,7 +333,7 @@ CommandSharedPtr HMICommandFactory::CreateCommand( } break; } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY case hmi_apis::FunctionID::BasicCommunication_DecryptCertificate: { if (is_response) { command.reset(new commands::DecryptCertificateResponse( @@ -344,7 +344,7 @@ CommandSharedPtr HMICommandFactory::CreateCommand( } break; } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY case hmi_apis::FunctionID::BasicCommunication_GetSystemInfo: { if (is_response) { command.reset( diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index ae4205d051..ffe84e0ce6 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -1544,13 +1544,13 @@ void MessageHelper::SendGetUserFriendlyMessageResponse( smart_objects::SmartObject& user_friendly_messages = (*message)[strings::msg_params][messages]; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY const std::string tts = "ttsString"; const std::string label = "label"; const std::string line1 = "line1"; const std::string line2 = "line2"; const std::string textBody = "textBody"; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY const std::string message_code = "messageCode"; std::vector<policy::UserFriendlyMessage>::const_iterator it = msg.begin(); std::vector<policy::UserFriendlyMessage>::const_iterator it_end = msg.end(); @@ -1560,7 +1560,7 @@ void MessageHelper::SendGetUserFriendlyMessageResponse( smart_objects::SmartObject& obj = user_friendly_messages[index]; obj[message_code] = it->message_code; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY if (!it->tts.empty()) { obj[tts] = it->tts; } @@ -1576,7 +1576,7 @@ void MessageHelper::SendGetUserFriendlyMessageResponse( if (!it->text_body.empty()) { obj[textBody] = it->text_body; } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } app_mngr.ManageHMICommand(message); diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 5be928fc5d..90c99f2bde 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -730,7 +730,7 @@ void PolicyHandler::OnVIIsReady() { void PolicyHandler::OnVehicleDataUpdated( const smart_objects::SmartObject& message) { POLICY_LIB_CHECK_VOID(); -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY if (!message.keyExists(strings::msg_params)) { LOG4CXX_ERROR(logger_, "Message does not contains mandatory section " @@ -914,7 +914,7 @@ bool PolicyHandler::UnloadPolicyLibrary() { return ret; } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY struct SDLAlowedNotification { SDLAlowedNotification(const connection_handler::DeviceHandle& device_id, PolicyManager* policy_manager, @@ -951,7 +951,7 @@ struct SDLAlowedNotification { PolicyManager* policy_manager_; StateController& state_controller_; }; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY void PolicyHandler::OnAllowSDLFunctionalityNotification( bool is_allowed, const std::string& device_mac) { @@ -985,7 +985,7 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification( LOG4CXX_WARN(logger_, "Device hadle with mac " << device_mac << " wasn't found."); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY DataAccessor<ApplicationSet> accessor = application_manager_.applications(); if (!is_allowed) { std::for_each( @@ -1001,7 +1001,7 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification( policy_manager_.get(), application_manager_.state_controller())); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } // Case, when specific device was changed @@ -1021,7 +1021,7 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification( pending_device_handles_.erase(it); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY if (is_allowed && last_activated_app_id_) { ApplicationSharedPtr app = application_manager_.application(last_activated_app_id_); @@ -1045,7 +1045,7 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification( last_activated_app_id_ = 0; } } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } void PolicyHandler::OnIgnitionCycleOver() { @@ -1075,7 +1075,7 @@ void PolicyHandler::OnActivateApp(uint32_t connection_key, } } else { permissions = policy_manager_->GetAppPermissionsChanges(policy_app_id); -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY UsageStatistics& usage = app->usage_report(); usage.RecordAppUserSelection(); @@ -1110,9 +1110,9 @@ void PolicyHandler::OnActivateApp(uint32_t connection_key, MessageHelper::SendOnAppPermissionsChangedNotification( app->app_id(), permissions, application_manager_); } -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY permissions.isSDLAllowed = true; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY policy_manager_->RemovePendingPermissionChanges(policy_app_id); } // If application is revoked it should not be activated @@ -1241,7 +1241,7 @@ bool PolicyHandler::SaveSnapshot(const BinaryMessage& pt_string, return result; } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void PolicyHandler::OnSnapshotCreated( const BinaryMessage& pt_string, const std::vector<int>& retry_delay_seconds, @@ -1254,7 +1254,7 @@ void PolicyHandler::OnSnapshotCreated( application_manager_); } } -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY void PolicyHandler::OnSnapshotCreated(const BinaryMessage& pt_string) { LOG4CXX_AUTO_TRACE(logger_); POLICY_LIB_CHECK_VOID(); @@ -1282,7 +1282,7 @@ void PolicyHandler::OnSnapshotCreated(const BinaryMessage& pt_string) { // reset update required false OnUpdateRequestSentToMobile(); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY bool PolicyHandler::GetPriority(const std::string& policy_app_id, std::string* priority) const { @@ -1448,7 +1448,7 @@ void PolicyHandler::OnUpdateHMIAppType( (*it)->OnUpdateHMIAppType(app_hmi_types); } } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY void PolicyHandler::OnCertificateUpdated(const std::string& certificate_data) { LOG4CXX_AUTO_TRACE(logger_); @@ -1525,7 +1525,7 @@ void PolicyHandler::OnCertificateDecrypted(bool is_succeeded) { std::bind2nd(std::mem_fun(&PolicyHandlerObserver::OnCertificateUpdated), certificate_data)); } -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY void PolicyHandler::OnCertificateUpdated(const std::string& certificate_data) { LOG4CXX_AUTO_TRACE(logger_); sync_primitives::AutoLock lock(listeners_lock_); @@ -1535,7 +1535,7 @@ void PolicyHandler::OnCertificateUpdated(const std::string& certificate_data) { observer->OnCertificateUpdated(certificate_data); } } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY bool PolicyHandler::CanUpdate() { return 0 != GetAppIdForSending(); @@ -1546,7 +1546,7 @@ void PolicyHandler::RemoveDevice(const std::string& device_id) { POLICY_LIB_CHECK_VOID(); policy_manager_->MarkUnpairedDevice(device_id); -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY connection_handler::DeviceHandle device_uid; if (application_manager_.connection_handler().GetDeviceID(device_id, &device_uid)) { @@ -1556,7 +1556,7 @@ void PolicyHandler::RemoveDevice(const std::string& device_id) { DeactivateApplication( device_uid, application_manager_.state_controller())); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } bool PolicyHandler::IsApplicationRevoked(const std::string& app_id) { @@ -1669,12 +1669,12 @@ const VehicleInfo policy::PolicyHandler::GetVehicleInfo() const { return policy_manager_->GetVehicleInfo(); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY const MetaInfo PolicyHandler::GetMetaInfo() const { POLICY_LIB_CHECK(MetaInfo()); return policy_manager_->GetMetaInfo(); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY void PolicyHandler::Increment(usage_statistics::GlobalCounterId type) { POLICY_LIB_CHECK(); diff --git a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc index b436a12787..ec346192c7 100644 --- a/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_system_request_notification_test.cc @@ -100,12 +100,12 @@ TEST_F(OnSystemRequestNotificationTest, Run_ProprietaryType_SUCCESS) { EXPECT_CALL(mock_policy_handler, IsRequestTypeAllowed(_, _)) .WillOnce(Return(true)); -#if defined(EXTENDED_POLICY) || defined(EXTENDED_PROPRIETARY) +#if defined(EXTENDED_POLICY) || defined(EXTERNAL_PROPRIETARY) EXPECT_CALL(app_mngr_, GetPolicyHandler()) .Times(2) .WillRepeatedly(ReturnRef(mock_policy_handler)); EXPECT_CALL(mock_policy_handler, TimeoutExchange()).WillOnce(Return(5u)); -#endif // EXTENDED_POLICY || EXTENDED_PROPRIETARY +#endif // EXTENDED_POLICY || EXTERNAL_PROPRIETARY EXPECT_CALL(message_helper_, PrintSmartObject(_)).WillOnce(Return(false)); EXPECT_CALL(app_mngr_, SendMessageToMobile(msg, _)); diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index b045f4b924..cc87376150 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -223,7 +223,7 @@ TEST_F(PolicyHandlerTest, EXPECT_FALSE(policy_handler_.ResetPolicyTable()); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY TEST_F(PolicyHandlerTest, ResetPolicyTable_PTNotInitialised_PTNotReset) { // Arrange EXPECT_CALL(app_manager_, event_dispatcher()); @@ -627,7 +627,7 @@ void PolicyHandlerTest::TestActivateApp(const uint32_t connection_key, permissions.appPermissionsConsentNeeded = true; // Check expectations -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY const connection_handler::DeviceHandle device_handle = 0u; EXPECT_CALL(app_manager_, connection_handler()) .WillRepeatedly(ReturnRef(conn_handler)); @@ -653,7 +653,7 @@ void PolicyHandlerTest::TestActivateApp(const uint32_t connection_key, SendOnAppPermissionsChangedNotification(kAppId_, _, _)); EXPECT_CALL(mock_session_observer, GetDataOnDeviceID(device_handle, _, _, _, _)); -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY EXPECT_CALL(*application1, policy_app_id()).WillOnce(Return(kPolicyAppId_)); EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_)) @@ -1261,19 +1261,19 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlNotAdded) { EnablePolicyAndPolicyManagerMock(); BinaryMessage msg; EndpointUrls test_data; -#if defined(EXTENDED_POLICY) || defined(EXTENDED_PROPRIETARY) +#if defined(EXTENDED_POLICY) || defined(EXTERNAL_PROPRIETARY) ExtendedPolicyExpectations(); -#endif // EXTENDED_POLICY || EXTENDED_PROPRIETARY -#ifdef EXTENDED_PROPRIETARY +#endif // EXTENDED_POLICY || EXTERNAL_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY std::vector<int> retry_delay_seconds; const int timeout_exchange = 10; // TODO(AKutsan): Policy move issues EXPECT_CALL(*mock_policy_manager_, GetUpdateUrls("0x07", _)) .WillRepeatedly(SetArgReferee<1>(test_data)); policy_handler_.OnSnapshotCreated(msg, retry_delay_seconds, timeout_exchange); -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY policy_handler_.OnSnapshotCreated(msg); -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY } TEST_F(PolicyHandlerTest, @@ -1297,7 +1297,7 @@ TEST_F(PolicyHandlerTest, policy_handler_.OnAllowSDLFunctionalityNotification(is_allowed, kPolicyAppId_); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) { EnablePolicyAndPolicyManagerMock(); BinaryMessage msg; @@ -1316,7 +1316,7 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) { policy_handler_.OnSnapshotCreated(msg, retry_delay_seconds, timeout_exchange); } -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) { EnablePolicyAndPolicyManagerMock(); BinaryMessage msg; @@ -1347,7 +1347,7 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlAdded) { policy_handler_.OnSnapshotCreated(msg); } -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY TEST_F(PolicyHandlerTest, OnAllowSDLFunctionalityNotification_Allowed_WithoutDevId_AppActivated) { @@ -1453,7 +1453,7 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_PredatePolicyNotAllowed) { policy_handler_.OnDeviceConsentChanged(kPolicyAppId_, is_allowed); } -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY TEST_F(PolicyHandlerTest, OnCertificateUpdated) { const std::string app_storage = "storage"; file_system::CreateFile("storage/certificate"); diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h index 0bfdf73e4b..f45de376f9 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -68,13 +68,13 @@ class PolicyHandlerInterface { virtual void OnPermissionsUpdated(const std::string& policy_app_id, const Permissions& permissions) = 0; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY virtual void OnSnapshotCreated(const BinaryMessage& pt_string, const std::vector<int>& retry_delay_seconds, int timeout_exchange) = 0; -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY virtual void OnSnapshotCreated(const BinaryMessage& pt_string) = 0; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY virtual bool GetPriority(const std::string& policy_app_id, std::string* priority) const = 0; @@ -289,9 +289,9 @@ class PolicyHandlerInterface { std::map<std::string, StringArray> app_hmi_types) = 0; virtual void OnCertificateUpdated(const std::string& certificate_data) = 0; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY virtual void OnCertificateDecrypted(bool is_succeeded) = 0; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY virtual bool CanUpdate() = 0; virtual void OnDeviceConsentChanged(const std::string& device_id, @@ -370,13 +370,13 @@ class PolicyHandlerInterface { * @return Structure with vehicle information */ virtual const VehicleInfo GetVehicleInfo() const = 0; -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY /** * @brief Gets meta information * @return meta information */ virtual const policy::MetaInfo GetMetaInfo() const = 0; -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY virtual void Increment(usage_statistics::GlobalCounterId type) = 0; virtual void Increment(const std::string& app_id, usage_statistics::AppCounterId type) = 0; diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h index 199544e5f7..e5cbdb641d 100644 --- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h +++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h @@ -64,14 +64,14 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { void(const std::string& policy_app_id, const policy::Permissions& permissions)); -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY MOCK_METHOD3(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string, const std::vector<int>& retry_delay_seconds, int timeout_exchange)); -#else // EXTENDED_PROPRIETARY +#else // EXTERNAL_PROPRIETARY MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string)); -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY MOCK_CONST_METHOD2(GetPriority, bool(const std::string& policy_app_id, @@ -188,9 +188,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { const std::vector<std::string>(const std::string& policy_app_id)); MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo()); -#ifdef EXTENDED_PROPRIETARY +#ifdef EXTERNAL_PROPRIETARY MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo()); -#endif // EXTENDED_PROPRIETARY +#endif // EXTERNAL_PROPRIETARY MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type)); MOCK_METHOD2(Increment, diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt index 7628a13b93..15767827a3 100644 --- a/tools/policy_table_validator/CMakeLists.txt +++ b/tools/policy_table_validator/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ) message(STATUS "use ${EXTENDED_POLICY} poicy") -if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY") +if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY") include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_premium/include/) else() include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_regular/include/) |