diff options
8 files changed, 0 insertions, 110 deletions
diff --git a/src/components/policy/policy_external/include/policy/policy_helper.h b/src/components/policy/policy_external/include/policy/policy_helper.h index ece033c23c..42c1ec0b46 100644 --- a/src/components/policy/policy_external/include/policy/policy_helper.h +++ b/src/components/policy/policy_external/include/policy/policy_helper.h @@ -324,22 +324,6 @@ FunctionalGroupIDs FindSame(const FunctionalGroupIDs& first, */ bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies); -#ifdef SDL_REMOTE_CONTROL - -struct ProccessAppGroups { - ProccessAppGroups(const policy_table::ApplicationPolicies& apps, - PolicyManagerImpl* pm) - : new_apps_(apps), pm_(pm), default_(new_apps_.find(kDefaultId)) {} - void operator()(const policy_table::ApplicationPolicies::value_type& app); - - private: - const policy_table::ApplicationPolicies& new_apps_; - PolicyManagerImpl* pm_; - policy_table::ApplicationPolicies::const_iterator default_; -}; - -#endif // SDL_REMOTE_CONTROL - } // namespace policy #endif // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_HELPER_H_ diff --git a/src/components/policy/policy_external/include/policy/policy_manager_impl.h b/src/components/policy/policy_external/include/policy/policy_manager_impl.h index b6865b645f..6e8c86103e 100644 --- a/src/components/policy/policy_external/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_external/include/policy/policy_manager_impl.h @@ -192,14 +192,6 @@ class PolicyManagerImpl : public PolicyManager { virtual bool GetHMITypes(const std::string& application_id, std::vector<int>* app_types) OVERRIDE; virtual void set_access_remote(utils::SharedPtr<AccessRemote> access_remote); - void CheckPTUUpdatesChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot); - - void CheckRemoteGroupsChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot); - void SendHMILevelChanged(const Subject& who); void OnPrimaryGroupsChanged(const std::string& application_id); diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc index 913a599bea..6594221f22 100644 --- a/src/components/policy/policy_external/src/policy_helper.cc +++ b/src/components/policy/policy_external/src/policy_helper.cc @@ -889,14 +889,5 @@ bool HaveGroupsChanged(const rpc::Optional<policy_table::Strings>& old_groups, Compare); } -void ProccessAppGroups::operator()( - const policy_table::ApplicationPolicies::value_type& app) { - policy_table::ApplicationPolicies::const_iterator i = - new_apps_.find(app.first); - if (i == new_apps_.end() && default_ != new_apps_.end()) { - i = default_; - } -} - #endif // SDL_REMOTE_CONTROL } // namespace policy diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index 7e7dd2b7c1..cb45840532 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -340,9 +340,6 @@ bool PolicyManagerImpl::LoadPT(const std::string& file, listener_->OnCertificateUpdated( *(pt_update->policy_table.module_config.certificate)); -#ifdef SDL_REMOTE_CONTROL - CheckPTUUpdatesChange(pt_update, policy_table_snapshot); -#endif // SDL_REMOTE_CONTROL std::map<std::string, StringArray> app_hmi_types; cache_->GetHMIAppTypeAfterUpdate(app_hmi_types); @@ -2014,25 +2011,6 @@ void PolicyManagerImpl::SendAppPermissionsChanged( listener()->OnPermissionsUpdated(application_id, notification_data); } -void PolicyManagerImpl::CheckPTUUpdatesChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot) { - CheckRemoteGroupsChange(pt_update, snapshot); -} - -void PolicyManagerImpl::CheckRemoteGroupsChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot) { - LOG4CXX_AUTO_TRACE(logger_); - - policy_table::ApplicationPolicies& new_apps = - pt_update->policy_table.app_policies_section.apps; - policy_table::ApplicationPolicies& old_apps = - snapshot->policy_table.app_policies_section.apps; - std::for_each( - old_apps.begin(), old_apps.end(), ProccessAppGroups(new_apps, this)); -} - void PolicyManagerImpl::OnPrimaryGroupsChanged( const std::string& application_id) { const std::vector<std::string> devices = diff --git a/src/components/policy/policy_regular/include/policy/policy_helper.h b/src/components/policy/policy_regular/include/policy/policy_helper.h index ce1288fa1b..996c2917d0 100644 --- a/src/components/policy/policy_regular/include/policy/policy_helper.h +++ b/src/components/policy/policy_regular/include/policy/policy_helper.h @@ -243,22 +243,6 @@ FunctionalGroupIDs FindSame(const FunctionalGroupIDs& first, * @return true, if succeded, otherwise - false */ bool UnwrapAppPolicies(policy_table::ApplicationPolicies& app_policies); - -#ifdef SDL_REMOTE_CONTROL - -struct ProccessAppGroups { - ProccessAppGroups(const policy_table::ApplicationPolicies& apps, - PolicyManagerImpl* pm) - : new_apps_(apps), pm_(pm), default_(new_apps_.find(kDefaultId)) {} - void operator()(const policy_table::ApplicationPolicies::value_type& app); - - private: - const policy_table::ApplicationPolicies& new_apps_; - PolicyManagerImpl* pm_; - policy_table::ApplicationPolicies::const_iterator default_; -}; - -#endif // SDL_REMOTE_CONTROL } #endif // SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_HELPER_H_ diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h index f8362f8546..cd3ef6b176 100644 --- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h +++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h @@ -193,14 +193,6 @@ class PolicyManagerImpl : public PolicyManager { std::vector<int>* app_types) OVERRIDE; virtual void set_access_remote(utils::SharedPtr<AccessRemote> access_remote); - void CheckPTUUpdatesChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot); - - void CheckRemoteGroupsChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot); - void SendHMILevelChanged(const Subject& who); void OnPrimaryGroupsChanged(const std::string& application_id); diff --git a/src/components/policy/policy_regular/src/policy_helper.cc b/src/components/policy/policy_regular/src/policy_helper.cc index d82d5396ca..f438b4317c 100644 --- a/src/components/policy/policy_regular/src/policy_helper.cc +++ b/src/components/policy/policy_regular/src/policy_helper.cc @@ -826,14 +826,5 @@ bool HaveGroupsChanged(const rpc::Optional<policy_table::Strings>& old_groups, Compare); } -void ProccessAppGroups::operator()( - const policy_table::ApplicationPolicies::value_type& app) { - policy_table::ApplicationPolicies::const_iterator i = - new_apps_.find(app.first); - if (i == new_apps_.end() && default_ != new_apps_.end()) { - i = default_; - } -} - #endif // SDL_REMOTE_CONTROL } diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc index 30e2be537b..75989e113c 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -214,9 +214,6 @@ bool PolicyManagerImpl::LoadPT(const std::string& file, listener_->OnCertificateUpdated( *(pt_update->policy_table.module_config.certificate)); } -#ifdef SDL_REMOTE_CONTROL - CheckPTUUpdatesChange(pt_update, policy_table_snapshot); -#endif // SDL_REMOTE_CONTROL std::map<std::string, StringArray> app_hmi_types; cache_->GetHMIAppTypeAfterUpdate(app_hmi_types); @@ -1246,25 +1243,6 @@ void PolicyManagerImpl::SendAppPermissionsChanged( listener()->OnPermissionsUpdated(application_id, notification_data); } -void PolicyManagerImpl::CheckPTUUpdatesChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot) { - CheckRemoteGroupsChange(pt_update, snapshot); -} - -void PolicyManagerImpl::CheckRemoteGroupsChange( - const utils::SharedPtr<policy_table::Table> pt_update, - const utils::SharedPtr<policy_table::Table> snapshot) { - LOG4CXX_AUTO_TRACE(logger_); - - policy_table::ApplicationPolicies& new_apps = - pt_update->policy_table.app_policies_section.apps; - policy_table::ApplicationPolicies& old_apps = - snapshot->policy_table.app_policies_section.apps; - std::for_each( - old_apps.begin(), old_apps.end(), ProccessAppGroups(new_apps, this)); -} - void PolicyManagerImpl::OnPrimaryGroupsChanged( const std::string& application_id) { const std::vector<std::string> devices = |