diff options
| author | sniukalov <sniukalov@luxoft.com> | 2019-06-27 21:35:50 +0300 |
|---|---|---|
| committer | sniukalov <sniukalov@luxoft.com> | 2019-08-14 14:59:40 +0300 |
| commit | 9487796ee0aded60b45d2a9bb729c0fc6010d0a2 (patch) | |
| tree | 1d09d599d0afc6fc5b45a5f7099e9b013d3ffbb9 | |
| parent | caa5911c0c976f432dd6e246555ba97bbc1e3bc4 (diff) | |
| download | sdl_core-9487796ee0aded60b45d2a9bb729c0fc6010d0a2.tar.gz | |
Removed DEPRECATED methods.
25 files changed, 20 insertions, 1337 deletions
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h index b8de08b7b6..add099f975 100644 --- a/src/components/application_manager/include/application_manager/application_manager_impl.h +++ b/src/components/application_manager/include/application_manager/application_manager_impl.h @@ -1036,17 +1036,6 @@ class ApplicationManagerImpl const connection_handler::DeviceHandle handle) const OVERRIDE; /** - * DEPRECATED - * @brief IsAppInReconnectMode check if application belongs to session - * affected by transport switching at the moment by checking internal - * waiting list prepared on switching start - * @param policy_app_id Application id - * @return True if application is in the waiting list, otherwise - false - */ - DEPRECATED bool IsAppInReconnectMode( - const std::string& policy_app_id) const FINAL; - - /** * @brief IsAppInReconnectMode check if application belongs to session * affected by transport switching at the moment by checking internal * waiting list prepared on switching start 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 275dd84ac7..3422a2a2d2 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 @@ -117,16 +117,6 @@ class PolicyHandler : public PolicyHandlerInterface, const std::string& device_id) const OVERRIDE; /** - * DEPRECATED - * @brief Sets HMI default type for specified application - * @param application_id ID application - * @param app_types list of HMI types - */ - DEPRECATED void SetDefaultHmiTypes( - const std::string& application_id, - const smart_objects::SmartObject* app_types) OVERRIDE; - - /** * @brief Sets HMI default type for specified application * @param device_handle device identifier * @param application_id ID application @@ -192,8 +182,6 @@ class PolicyHandler : public PolicyHandlerInterface, bool GetModuleTypes(const std::string& policy_app_id, std::vector<std::string>* modules) const OVERRIDE; - DEPRECATED bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const OVERRIDE; bool GetDefaultHmi(const std::string& device_id, const std::string& policy_app_id, std::string* default_hmi) const OVERRIDE; @@ -532,18 +520,6 @@ class PolicyHandler : public PolicyHandlerInterface, virtual void GetAvailableApps(std::queue<std::string>& apps) OVERRIDE; /** - * DEPRECATED - * @brief Allows to add new or update existed application during - * registration process - * @param application_id The policy aplication id. - * @param hmi_types list of hmi types - * @return function that will notify update manager about new application - */ - DEPRECATED StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE; - - /** * @brief Allows to add new or update existed application during * registration process * @param device_id device identifier @@ -592,17 +568,6 @@ class PolicyHandler : public PolicyHandlerInterface, void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED void OnAppRegisteredOnMobile( - const std::string& application_id) OVERRIDE; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -614,17 +579,6 @@ class PolicyHandler : public PolicyHandlerInterface, const std::string& application_id) OVERRIDE; /** - * DEPRECATED - * @brief Checks if certain request type is allowed for application - * @param policy_app_id Unique applicaion id - * @param type Request type - * @return true, if allowed, otherwise - false - */ - DEPRECATED bool IsRequestTypeAllowed( - const std::string& policy_app_id, - mobile_apis::RequestType::eType type) const OVERRIDE; - - /** * @brief Checks if certain request type is allowed for application * @param device_handle device identifier * @param policy_app_id Unique applicaion id @@ -663,15 +617,6 @@ class PolicyHandler : public PolicyHandlerInterface, const std::string& policy_app_id) const OVERRIDE; /** - * DEPRECATED - * @brief Gets application request types - * @param policy_app_id Unique application id - * @return request types - */ - DEPRECATED const std::vector<std::string> GetAppRequestTypes( - const std::string& policy_app_id) const OVERRIDE; - - /** * @brief Gets application request types * @param device_id device identifier * @param policy_app_id Unique application id @@ -747,28 +692,6 @@ class PolicyHandler : public PolicyHandlerInterface, private: /** - * DEPRECATED - * @brief Update currently used device id in policies manager for given - * application - * @param policy_app_id Application id - */ - std::string OnCurrentDeviceIdUpdateRequired( - const std::string& policy_app_id) OVERRIDE; - - void OnPendingPermissionChange(const std::string& policy_app_id) OVERRIDE; - - void SendOnAppPermissionsChanged( - const AppPermissions& permissions, - const std::string& policy_app_id) const OVERRIDE; - - void OnPermissionsUpdated(const std::string& policy_app_id, - const Permissions& permissions, - const HMILevel& default_hmi) OVERRIDE; - - void OnPermissionsUpdated(const std::string& policy_app_id, - const Permissions& permissions) OVERRIDE; - - /** * Checks system action of application for permission of keep context * @param system_action system action (see mobile api) * @param policy_app_id unique application id diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc index 54c81d7fa9..ffa7203f1f 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc @@ -174,7 +174,7 @@ TEST_F(OnSystemRequestNotificationTest, Run_InvalidApp_NoNotification) { EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillOnce(Return(MockAppPtr())); EXPECT_CALL(*mock_app_, policy_app_id()).Times(0); - EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _)).Times(0); + EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _, _)).Times(0); EXPECT_CALL(mock_message_helper_, PrintSmartObject(_)).Times(0); diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 412b8533ba..fbbcc12249 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -121,20 +121,6 @@ bool device_id_comparator(const std::string& device_id, } /** - * DEPRECATED - * @brief policy_app_id_comparator is predicate to compare policy application - * ids - * @param policy_app_id Policy id of application - * @param app Application pointer - * @return True if policy id of application matches to policy id passed - */ -bool policy_app_id_comparator(const std::string& policy_app_id, - ApplicationSharedPtr app) { - DCHECK_OR_RETURN(app, false); - return app->policy_app_id() == policy_app_id; -} - -/** * @brief PolicyAppIdComparator is struct predicate to compare policy * application ids & device * @param device_handle of application @@ -3541,17 +3527,6 @@ bool ApplicationManagerImpl::IsApplicationForbidden( } bool ApplicationManagerImpl::IsAppInReconnectMode( - const std::string& policy_app_id) const { - LOG4CXX_AUTO_TRACE(logger_); - sync_primitives::AutoLock lock(reregister_wait_list_lock_); - return reregister_wait_list_.end() != - std::find_if(reregister_wait_list_.begin(), - reregister_wait_list_.end(), - std::bind1st(std::ptr_fun(&policy_app_id_comparator), - policy_app_id)); -} - -bool ApplicationManagerImpl::IsAppInReconnectMode( const connection_handler::DeviceHandle& device_id, const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index 114dd14772..fdbd0ce391 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -480,22 +480,6 @@ void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id, } void PolicyHandler::SendOnAppPermissionsChanged( - const AppPermissions& permissions, const std::string& policy_app_id) const { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG( - logger_, - "PolicyHandler::SendOnAppPermissionsChanged for " << policy_app_id); - ApplicationSharedPtr app = - application_manager_.application_by_policy_id(policy_app_id); - if (app.use_count() == 0) { - LOG4CXX_WARN(logger_, "No app found for policy app id = " << policy_app_id); - return; - } - MessageHelper::SendOnAppPermissionsChangedNotification( - app->app_id(), permissions, application_manager_); -} - -void PolicyHandler::SendOnAppPermissionsChanged( const AppPermissions& permissions, const std::string& device_id, const std::string& policy_app_id) const { @@ -1355,62 +1339,6 @@ void PolicyHandler::PTExchangeAtUserRequest(uint32_t correlation_id) { update_status, correlation_id, application_manager_); } -void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id, - const Permissions& permissions, - const HMILevel& default_hmi) { - LOG4CXX_AUTO_TRACE(logger_); - OnPermissionsUpdated(policy_app_id, permissions); - - ApplicationSharedPtr app = - application_manager_.application_by_policy_id(policy_app_id); - if (app.use_count() == 0) { - LOG4CXX_WARN( - logger_, - "Connection_key not found for application_id: " << policy_app_id); - return; - } - - // The application currently not running (i.e. in NONE) should change HMI - // level to default - mobile_apis::HMILevel::eType current_hmi_level = app->hmi_level(); - mobile_apis::HMILevel::eType hmi_level = - MessageHelper::StringToHMILevel(default_hmi); - - if (mobile_apis::HMILevel::INVALID_ENUM == hmi_level) { - LOG4CXX_WARN( - logger_, - "Couldn't convert default hmi level " << default_hmi << " to enum."); - return; - } - if (current_hmi_level == hmi_level) { - LOG4CXX_DEBUG(logger_, "Application already in default hmi state."); - return; - } - switch (current_hmi_level) { - case mobile_apis::HMILevel::HMI_NONE: { - LOG4CXX_INFO(logger_, - "Changing hmi level of application " - << policy_app_id << " to default hmi level " - << default_hmi); - - if (hmi_level == mobile_apis::HMILevel::HMI_FULL) { - application_manager_.state_controller().SetRegularState( - app, hmi_level, true); - } else { - application_manager_.state_controller().SetRegularState( - app, hmi_level, false); - } - break; - } - default: - LOG4CXX_WARN(logger_, - "Application " << policy_app_id - << " is running." - "HMI level won't be changed."); - break; - } -} - void PolicyHandler::OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions, @@ -1467,27 +1395,6 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& device_id, } } -void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id, - const Permissions& permissions) { - LOG4CXX_AUTO_TRACE(logger_); - ApplicationSharedPtr app = - application_manager_.application_by_policy_id(policy_app_id); - if (app.use_count() == 0) { - LOG4CXX_WARN( - logger_, - "Connection_key not found for application_id: " << policy_app_id); - return; - } - - MessageHelper::SendOnPermissionsChangeNotification( - app->app_id(), permissions, application_manager_); - - LOG4CXX_DEBUG(logger_, - "Notification sent for application_id: " - << policy_app_id << " and connection_key " - << app->app_id()); -} - void PolicyHandler::OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions) { @@ -2181,16 +2088,6 @@ void PolicyHandler::OnAppsSearchCompleted(const bool trigger_ptu) { policy_manager_->OnAppsSearchCompleted(trigger_ptu); } -void PolicyHandler::OnAppRegisteredOnMobile(const std::string& application_id) { - POLICY_LIB_CHECK_VOID(); - const auto app = - application_manager_.application_by_policy_id(application_id); - if (app.use_count()) { - policy_manager_->OnAppRegisteredOnMobile(app->mac_address(), - application_id); - } -} - void PolicyHandler::OnAppRegisteredOnMobile(const std::string& device_id, const std::string& application_id) { POLICY_LIB_CHECK_VOID(); diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h index 219da72563..e03fdcfb94 100644 --- a/src/components/include/application_manager/application_manager.h +++ b/src/components/include/application_manager/application_manager.h @@ -94,12 +94,6 @@ class StateControllerImpl; struct CommandParametersPermissions; using policy::RPCParams; typedef std::vector<ApplicationSharedPtr> AppSharedPtrs; -struct DEPRECATED ApplicationsAppIdSorter { - bool operator()(const ApplicationSharedPtr lhs, - const ApplicationSharedPtr rhs) const { - return lhs->app_id() < rhs->app_id(); - } -}; struct ApplicationsSorter { bool operator()(const ApplicationSharedPtr lhs, const ApplicationSharedPtr rhs) const { @@ -642,17 +636,6 @@ class ApplicationManager { uint32_t connection_key, const std::string& policy_app_id) const = 0; /** - * DEPRECATED - * @brief IsAppInReconnectMode check if application belongs to session - * affected by transport switching at the moment - * @param policy_app_id Application id - * @return True if application is registered within session being switched, - * otherwise - false - */ - DEPRECATED virtual bool IsAppInReconnectMode( - const std::string& policy_app_id) const = 0; - - /** * @brief IsAppInReconnectMode check if application belongs to session * affected by transport switching at the moment * @param device_id device indentifier 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 c4c1a6a8f9..3387ed2fc6 100644 --- a/src/components/include/application_manager/policies/policy_handler_interface.h +++ b/src/components/include/application_manager/policies/policy_handler_interface.h @@ -71,15 +71,10 @@ class PolicyHandlerInterface { virtual bool ReceiveMessageFromSDK(const std::string& file, const BinaryMessage& pt_string) = 0; virtual bool UnloadPolicyLibrary() = 0; - DEPRECATED virtual void OnPermissionsUpdated(const std::string& policy_app_id, - const Permissions& permissions, - const HMILevel& default_hmi) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions, const HMILevel& default_hmi) = 0; - DEPRECATED virtual void OnPermissionsUpdated( - const std::string& policy_app_id, const Permissions& permissions) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions) = 0; @@ -104,8 +99,6 @@ class PolicyHandlerInterface { const std::string& priority) const = 0; virtual DeviceConsent GetUserConsentForDevice( const std::string& device_id) const = 0; - DEPRECATED virtual bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const = 0; virtual bool GetDefaultHmi(const std::string& device_id, const std::string& policy_app_id, std::string* default_hmi) const = 0; @@ -144,10 +137,6 @@ class PolicyHandlerInterface { virtual std::shared_ptr<usage_statistics::StatisticsManager> GetStatisticManager() const = 0; - DEPRECATED virtual void SendOnAppPermissionsChanged( - const AppPermissions& permissions, - const std::string& policy_app_id) const = 0; - virtual void SendOnAppPermissionsChanged( const AppPermissions& permissions, const std::string& device_id, @@ -190,9 +179,6 @@ class PolicyHandlerInterface { */ virtual void OnIgnitionCycleOver() = 0; - DEPRECATED virtual void OnPendingPermissionChange( - const std::string& policy_app_id) = 0; - virtual void OnPendingPermissionChange(const std::string& device_id, const std::string& policy_app_id) = 0; @@ -271,15 +257,6 @@ class PolicyHandlerInterface { virtual void OnUpdateStatusChanged(const std::string& status) = 0; /** - * DEPRECATED - * @brief Update currently used device id in policies manager for given - * application - * @param policy_app_id Application id - */ - DEPRECATED virtual std::string OnCurrentDeviceIdUpdateRequired( - const std::string& policy_app_id) = 0; - - /** * @brief Update currently used device id in policies manager for given * application * @param device_handle device identifier @@ -369,17 +346,6 @@ class PolicyHandlerInterface { virtual void GetAvailableApps(std::queue<std::string>& apps) = 0; /** - * DEPRECATED - * @brief Allows to add new or update existed application during - * registration process - * @param application_id The policy aplication id. - * @return function that will notify update manager about new application - */ - DEPRECATED virtual StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0; - - /** * @brief Allows to add new or update existed application during * registration process * @param device_id device identifier @@ -422,17 +388,6 @@ class PolicyHandlerInterface { virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED virtual void OnAppRegisteredOnMobile( - const std::string& application_id) = 0; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -444,17 +399,6 @@ class PolicyHandlerInterface { const std::string& application_id) = 0; /** - * DEPRECATED - * @brief Checks if certain request type is allowed for application - * @param policy_app_id Unique applicaion id - * @param type Request type - * @return true, if allowed, otherwise - false - */ - DEPRECATED virtual bool IsRequestTypeAllowed( - const std::string& policy_app_id, - mobile_apis::RequestType::eType type) const = 0; - - /** * @brief Checks if certain request type is allowed for application * @param device_handle device identifier * @param policy_app_id Unique applicaion id @@ -493,15 +437,6 @@ class PolicyHandlerInterface { const std::string& policy_app_id) const = 0; /** - * DEPRECATED - * @brief Gets application request types - * @param policy_app_id Unique application id - * @return request types - */ - DEPRECATED virtual const std::vector<std::string> GetAppRequestTypes( - const std::string& policy_app_id) const = 0; - - /** * @brief Gets application request types * @param device_handle device identifier * @param policy_app_id Unique application id @@ -643,16 +578,6 @@ class PolicyHandlerInterface { const std::string& device_id_to) = 0; /** - * DEPERECATED - * @brief Sets HMI default type for specified application - * @param application_id ID application - * @param app_types list of HMI types - */ - DEPRECATED virtual void SetDefaultHmiTypes( - const std::string& application_id, - const smart_objects::SmartObject* app_types) = 0; - - /** * @brief Sets HMI default type for specified application * @param device_handle device identifier * @param application_id ID application diff --git a/src/components/include/policy/policy_external/policy/policy_listener.h b/src/components/include/policy/policy_external/policy/policy_listener.h index 69a459745b..8203f5c9b6 100644 --- a/src/components/include/policy/policy_external/policy/policy_listener.h +++ b/src/components/include/policy/policy_external/policy/policy_listener.h @@ -45,26 +45,16 @@ namespace custom_str = utils::custom_string; class PolicyListener { public: virtual ~PolicyListener() {} - DEPRECATED virtual void OnPermissionsUpdated( - const std::string& policy_app_id, - const Permissions& permissions, - const policy::HMILevel& default_hmi) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions, const policy::HMILevel& default_hmi) = 0; - DEPRECATED virtual void OnPermissionsUpdated( - const std::string& policy_app_id, const Permissions& permissions) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions) = 0; - DEPRECATED virtual void OnPendingPermissionChange( - const std::string& policy_app_id) = 0; virtual void OnPendingPermissionChange(const std::string& device_id, const std::string& policy_app_id) = 0; virtual void OnUpdateStatusChanged(const std::string&) = 0; - DEPRECATED virtual std::string OnCurrentDeviceIdUpdateRequired( - const std::string& policy_app_id) = 0; virtual std::string OnCurrentDeviceIdUpdateRequired( const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id) = 0; @@ -107,16 +97,6 @@ class PolicyListener { bool is_allowed) = 0; /** - * DEPRECATED - * @brief Sends OnAppPermissionsChanged notification to HMI - * @param permissions contains parameter for OnAppPermisionChanged - * @param policy_app_id contains policy application id - */ - DEPRECATED virtual void SendOnAppPermissionsChanged( - const AppPermissions& permissions, - const std::string& policy_app_id) const = 0; - - /** * @brief Sends OnAppPermissionsChanged notification to HMI * @param permissions contains parameter for OnAppPermisionChanged * @param device_id device identifier diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h index a53ade33aa..c6f0202d59 100644 --- a/src/components/include/policy/policy_external/policy/policy_manager.h +++ b/src/components/include/policy/policy_external/policy/policy_manager.h @@ -130,24 +130,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void RequestPTUpdate() = 0; /** - * DEPRECATED - * @brief Check if specified RPC for specified application - * has permission to be executed in specified HMI Level - * and also its permitted params. - * @param app_id Id of application provided during registration - * @param hmi_level Current HMI Level of application - * @param rpc Name of RPC - * @param rpc_params List of RPC params - * @param CheckPermissionResult containing flag if HMI Level is allowed - * and list of allowed params. - */ - DEPRECATED virtual void CheckPermissions(const PTString& app_id, - const PTString& hmi_level, - const PTString& rpc, - const RPCParams& rpc_params, - CheckPermissionResult& result) = 0; - - /** * @brief Check if specified RPC for specified application * has permission to be executed in specified HMI Level * and also its permitted params. @@ -283,17 +265,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const bool is_allowed) = 0; /** - * DEPRECATED - * @brief Update Application Policies as reaction - * on User allowing/disallowing device this app is running on. - * @param app_id Unique application id - * @param is_device_allowed true if user allowing device otherwise false - * @return true if operation was successful - */ - DEPRECATED virtual bool ReactOnUserDevConsentForApp( - const std::string& app_id, const bool is_device_allowed) = 0; - - /** * @brief Update Application Policies as reaction * on User allowing/disallowing device this app is running on. * @param device_handle device identifier @@ -351,17 +322,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const NotificationMode mode) = 0; /** - * DEPRECATED - * @brief Get default HMI level for application - * @param policy_app_id Unique application id - * @param default_hmi Default HMI level for application or empty, if value - * was not set - * @return true, if succedeed, otherwise - false - */ - DEPRECATED virtual bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const = 0; - - /** * @brief Get default HMI level for application * @param device_id device identifier * @param policy_app_id Unique application id @@ -414,16 +374,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { std::vector<FunctionalGroupPermission>& permissions) = 0; /** - * DEPRECATED - * @brief Gets specific application permissions changes since last policy - * table update - * @param policy_app_id Unique application id - * @return Permissions changes - */ - DEPRECATED virtual AppPermissions GetAppPermissionsChanges( - const std::string& policy_app_id) = 0; - - /** * @brief Gets specific application permissions changes since last policy * table update * @param device_id device identifier @@ -440,14 +390,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void RemovePendingPermissionChanges(const std::string& app_id) = 0; /** - * DEPRECATED - * @brief Return device id, which hosts specific application - * @param policy_app_id Application id, which is required to update device id - */ - DEPRECATED virtual std::string& GetCurrentDeviceId( - const std::string& policy_app_id) const = 0; - - /** * @brief Return device id, which hosts specific application * @param device_handle device identifier * @param policy_app_id Application id, which is required to update device id @@ -473,14 +415,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& language) = 0; /** - * DEPRECATED - * @brief Send OnPermissionsUpdated for choosen application - * @param application_id Unique application id - */ - DEPRECATED virtual void SendNotificationOnPermissionsUpdated( - const std::string& application_id) = 0; - - /** * @brief Send OnPermissionsUpdated for choosen application * @param device_id device identifier * @param application_id Unique application id @@ -495,18 +429,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void MarkUnpairedDevice(const std::string& device_id) = 0; /** - * DEPRECATED - * @brief Adds, application to the db or update existed one - * run PTU if policy update is necessary for application. - * @param application_id Unique application id - * @param hmi_types application HMI types - * @return function that will notify update manager about new application - */ - DEPRECATED virtual StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0; - - /** * @brief Adds, application to the db or update existed one * run PTU if policy update is necessary for application. * @param device_id device identifier @@ -593,17 +515,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED virtual void OnAppRegisteredOnMobile( - const std::string& application_id) = 0; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -634,15 +545,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& policy_app_id) const = 0; /** - * DEPRECATED - * @brief Gets request types for application - * @param policy_app_id Unique application id - * @return request types of application - */ - DEPRECATED virtual const std::vector<std::string> GetAppRequestTypes( - const std::string policy_app_id) const = 0; - - /** * @brief Gets request types for application * @param device_handle device identifier * @param policy_app_id Unique application id @@ -809,15 +711,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0; /** - * DEPRECATED - * @brief Assigns new HMI types for specified application - * @param application_id Unique application id - * @param hmi_types new HMI types list - */ - DEPRECATED virtual void SetDefaultHmiTypes( - const std::string& application_id, const std::vector<int>& hmi_types) = 0; - - /** * @brief Assigns new HMI types for specified application * @param device_handle device identifier * @param application_id Unique application id diff --git a/src/components/include/policy/policy_regular/policy/policy_listener.h b/src/components/include/policy/policy_regular/policy/policy_listener.h index 25e09343f5..d717822cac 100644 --- a/src/components/include/policy/policy_regular/policy/policy_listener.h +++ b/src/components/include/policy/policy_regular/policy/policy_listener.h @@ -45,26 +45,16 @@ namespace custom_str = utils::custom_string; class PolicyListener { public: virtual ~PolicyListener() {} - DEPRECATED virtual void OnPermissionsUpdated( - const std::string& policy_app_id, - const Permissions& permissions, - const policy::HMILevel& default_hmi) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions, const policy::HMILevel& default_hmi) = 0; - DEPRECATED virtual void OnPermissionsUpdated( - const std::string& policy_app_id, const Permissions& permissions) = 0; virtual void OnPermissionsUpdated(const std::string& device_id, const std::string& policy_app_id, const Permissions& permissions) = 0; - DEPRECATED virtual void OnPendingPermissionChange( - const std::string& policy_app_id) = 0; virtual void OnPendingPermissionChange(const std::string& device_id, const std::string& policy_app_id) = 0; virtual void OnUpdateStatusChanged(const std::string&) = 0; - DEPRECATED virtual std::string OnCurrentDeviceIdUpdateRequired( - const std::string& policy_app_id) = 0; virtual std::string OnCurrentDeviceIdUpdateRequired( const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id) = 0; @@ -105,16 +95,6 @@ class PolicyListener { bool is_allowed) = 0; /** - * DEPRECATED - * @brief Sends OnAppPermissionsChanged notification to HMI - * @param permissions contains parameter for OnAppPermisionChanged - * @param policy_app_id contains policy application id - */ - DEPRECATED virtual void SendOnAppPermissionsChanged( - const AppPermissions& permissions, - const std::string& policy_app_id) const = 0; - - /** * @brief Sends OnAppPermissionsChanged notification to HMI * @param permissions contains parameter for OnAppPermisionChanged * @param device_id device identifier diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h index cf256f41d6..c1547da760 100644 --- a/src/components/include/policy/policy_regular/policy/policy_manager.h +++ b/src/components/include/policy/policy_regular/policy/policy_manager.h @@ -258,17 +258,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { bool is_allowed) = 0; /** - * DEPRECATED - * @brief Update Application Policies as reaction - * on User allowing/disallowing device this app is running on. - * @param app_id Unique application id - * @param is_device_allowed true if user allowing device otherwise false - * @return true if operation was successful - */ - DEPRECATED virtual bool ReactOnUserDevConsentForApp( - const std::string app_id, bool is_device_allowed) = 0; - - /** * @brief Update Application Policies as reaction * on User allowing/disallowing device this app is running on. * @param device_handle device identifier @@ -324,17 +313,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void SetUserConsentForApp(const PermissionConsent& permissions) = 0; /** - * DEPRECATED - * @brief Get default HMI level for application - * @param policy_app_id Unique application id - * @param default_hmi Default HMI level for application or empty, if value - * was not set - * @return true, if succedeed, otherwise - false - */ - DEPRECATED virtual bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const = 0; - - /** * @brief Get default HMI level for application * @param device_id device identifier * @param policy_app_id Unique application id @@ -385,16 +363,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { std::vector<FunctionalGroupPermission>& permissions) = 0; /** - * DEPRECATED - * @brief Gets specific application permissions changes since last policy - * table update - * @param policy_app_id Unique application id - * @return Permissions changes - */ - DEPRECATED virtual AppPermissions GetAppPermissionsChanges( - const std::string& policy_app_id) = 0; - - /** * @brief Gets specific application permissions changes since last policy * table update * @param device_id device identifier @@ -411,14 +379,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void RemovePendingPermissionChanges(const std::string& app_id) = 0; /** - * DEPRECATED - * @brief Return device id, which hosts specific application - * @param policy_app_id Application id, which is required to update device id - */ - DEPRECATED virtual std::string& GetCurrentDeviceId( - const std::string& policy_app_id) const = 0; - - /** * @brief Return device id, which hosts specific application * @param device_handle device identifier * @param policy_app_id Application id, which is required to update device id @@ -444,14 +404,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& language) = 0; /** - * DEPRECATED - * @brief Send OnPermissionsUpdated for choosen application - * @param application_id Unique application id - */ - DEPRECATED virtual void SendNotificationOnPermissionsUpdated( - const std::string& application_id) = 0; - - /** * @brief Send OnPermissionsUpdated for choosen application * @param device_id device identifier * @param application_id Unique application id @@ -466,18 +418,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual void MarkUnpairedDevice(const std::string& device_id) = 0; /** - * DEPRECATED - * @brief Adds, application to the db or update existed one - * run PTU if policy update is necessary for application. - * @param application_id Unique application id - * @param hmi_types application HMI types - * @return function that will notify update manager about new application - */ - DEPRECATED virtual StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0; - - /** * @brief Adds, application to the db or update existed one * run PTU if policy update is necessary for application. * @param device_id device identifier @@ -705,17 +645,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { const std::string& policy_app_id) const = 0; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED virtual void OnAppRegisteredOnMobile( - const std::string& application_id) = 0; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -758,15 +687,6 @@ class PolicyManager : public usage_statistics::StatisticsManager { virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0; /** - * DEPRECATED - * @brief Assigns new HMI types for specified application - * @param application_id Unique application id - * @param hmi_types new HMI types list - */ - DEPRECATED virtual void SetDefaultHmiTypes( - const std::string& application_id, const std::vector<int>& hmi_types) = 0; - - /** * @brief Assigns new HMI types for specified application * @param device_handle device identifier * @param application_id Unique application id diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h index b498708beb..1579341be7 100644 --- a/src/components/include/test/application_manager/mock_application_manager.h +++ b/src/components/include/test/application_manager/mock_application_manager.h @@ -335,8 +335,6 @@ class MockApplicationManager : public application_manager::ApplicationManager { MOCK_METHOD2(ProcessReconnection, void(application_manager::ApplicationSharedPtr application, const uint32_t connection_key)); - MOCK_CONST_METHOD1(IsAppInReconnectMode, - bool(const std::string& policy_app_id)); MOCK_CONST_METHOD2(IsAppInReconnectMode, bool(const connection_handler::DeviceHandle& device_id, const std::string& policy_app_id)); 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 51e95a5d88..36a9ab4c4c 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 @@ -57,13 +57,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { bool(const std::string& file, const policy::BinaryMessage& pt_string)); MOCK_METHOD0(UnloadPolicyLibrary, bool()); - MOCK_METHOD2(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions)); - MOCK_METHOD3(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions, - const policy::HMILevel& default_hmi)); MOCK_METHOD4(OnPermissionsUpdated, void(const std::string& device_id, const std::string& policy_app_id, @@ -95,9 +88,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { uint32_t(const std::string& priority)); MOCK_CONST_METHOD1(GetUserConsentForDevice, policy::DeviceConsent(const std::string& device_id)); - MOCK_CONST_METHOD2(GetDefaultHmi, - bool(const std::string& policy_app_id, - std::string* default_hmi)); MOCK_CONST_METHOD3(GetDefaultHmi, bool(const std::string& device_id, const std::string& policy_app_id, @@ -140,8 +130,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_METHOD2(OnAllowSDLFunctionalityNotification, void(bool is_allowed, const std::string& device_id)); MOCK_METHOD0(OnIgnitionCycleOver, void()); - MOCK_METHOD1(OnPendingPermissionChange, - void(const std::string& policy_app_id)); MOCK_METHOD2(OnPendingPermissionChange, void(const std::string& device_id, const std::string& policy_app_id)); @@ -172,8 +160,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { const uint32_t correlation_id)); MOCK_METHOD1(OnGetStatusUpdate, void(const uint32_t correlation_id)); MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status)); - MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired, - std::string(const std::string& policy_app_id)); MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired, std::string(const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id)); @@ -201,20 +187,12 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_METHOD0(CanUpdate, bool()); MOCK_METHOD2(OnDeviceConsentChanged, void(const std::string& device_id, bool is_allowed)); - MOCK_CONST_METHOD2(SendOnAppPermissionsChanged, - void(const policy::AppPermissions& permissions, - const std::string& policy_app_id)); MOCK_CONST_METHOD3(SendOnAppPermissionsChanged, void(const policy::AppPermissions& permissions, const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD0(OnPTExchangeNeeded, void()); MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>& apps)); - MOCK_METHOD2( - AddApplication, - policy::StatusNotifier( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); MOCK_METHOD3( AddApplication, policy::StatusNotifier( @@ -226,14 +204,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD1(HeartBeatTimeout, uint32_t(const std::string& app_id)); MOCK_METHOD0(OnAppsSearchStarted, void()); MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu)); - MOCK_METHOD1(OnAppRegisteredOnMobile, - void(const std::string& application_id)); MOCK_METHOD2(OnAppRegisteredOnMobile, void(const std::string& device_id, const std::string& application_id)); - MOCK_CONST_METHOD2(IsRequestTypeAllowed, - bool(const std::string& policy_app_id, - mobile_apis::RequestType::eType type)); MOCK_CONST_METHOD3(IsRequestTypeAllowed, bool(const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id, @@ -250,9 +223,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD1( GetAppRequestSubTypes, const std::vector<std::string>(const std::string& policy_app_id)); - MOCK_CONST_METHOD1( - GetAppRequestTypes, - const std::vector<std::string>(const std::string& policy_app_id)); MOCK_CONST_METHOD2(GetAppRequestTypes, const std::vector<std::string>( const transport_manager::DeviceHandle& device_handle, @@ -333,9 +303,6 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface { MOCK_CONST_METHOD2(GetModuleTypes, bool(const std::string& policy_app_id, std::vector<std::string>* modules)); - MOCK_METHOD2(SetDefaultHmiTypes, - void(const std::string& application_id, - const smart_objects::SmartObject* app_types)); MOCK_METHOD3(SetDefaultHmiTypes, void(const transport_manager::DeviceHandle& device_handle, const std::string& application_id, diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h index a0452855f6..16341ed4f4 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h @@ -55,30 +55,19 @@ namespace custom_str = utils::custom_string; class MockPolicyListener : public ::policy::PolicyListener { public: - MOCK_METHOD3(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions, - const policy::HMILevel& default_hmi)); MOCK_METHOD4(OnPermissionsUpdated, void(const std::string& device_id, const std::string& policy_app_id, const policy::Permissions& permissions, const policy::HMILevel& default_hmi)); - MOCK_METHOD2(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions)); MOCK_METHOD3(OnPermissionsUpdated, void(const std::string& device_id, const std::string& policy_app_id, const policy::Permissions& permissions)); - MOCK_METHOD1(OnPendingPermissionChange, - void(const std::string& policy_app_id)); MOCK_METHOD2(OnPendingPermissionChange, void(const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status)); - MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired, - std::string(const std::string& policy_app_id)); MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired, std::string(const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id)); @@ -101,8 +90,6 @@ class MockPolicyListener : public ::policy::PolicyListener { void(const std::string& policy_app_id, const std::string& auth_token)); MOCK_METHOD1(OnPTUFinished, void(const bool ptu_result)); - MOCK_CONST_METHOD2(SendOnAppPermissionsChanged, - void(const policy::AppPermissions&, const std::string&)); MOCK_CONST_METHOD3(SendOnAppPermissionsChanged, void(const policy::AppPermissions& permissions, const std::string& device_id, diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h index 7ab075a94e..5313628890 100644 --- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h @@ -68,12 +68,6 @@ class MockPolicyManager : public PolicyManager { void(const std::string& service_type, EndpointUrls& out_end_points)); MOCK_METHOD0(RequestPTUpdate, void()); - MOCK_METHOD5(CheckPermissions, - void(const PTString& app_id, - const PTString& hmi_level, - const PTString& rpc, - const RPCParams& rpc_params, - CheckPermissionResult& result)); MOCK_METHOD6(CheckPermissions, void(const PTString& device_id, const PTString& app_id, @@ -106,8 +100,6 @@ class MockPolicyManager : public PolicyManager { std::vector<policy::FunctionalGroupPermission>& permissions)); MOCK_METHOD2(SetUserConsentForDevice, void(const std::string& device_id, const bool is_allowed)); - MOCK_METHOD2(ReactOnUserDevConsentForApp, - bool(const std::string& app_id, bool is_device_allowed)); MOCK_METHOD3(ReactOnUserDevConsentForApp, bool(const transport_manager::DeviceHandle& device_handle, const std::string& app_id, @@ -128,9 +120,6 @@ class MockPolicyManager : public PolicyManager { MOCK_METHOD2(SetUserConsentForApp, void(const policy::PermissionConsent& permissions, const policy::PolicyManager::NotificationMode mode)); - MOCK_CONST_METHOD2(GetDefaultHmi, - bool(const std::string& policy_app_id, - std::string* default_hmi)); MOCK_CONST_METHOD3(GetDefaultHmi, bool(const std::string& device_id, const std::string& policy_app_id, @@ -149,14 +138,10 @@ class MockPolicyManager : public PolicyManager { void(const std::string& device_id, const std::string& policy_app_id, std::vector<policy::FunctionalGroupPermission>& permissions)); - MOCK_METHOD1(GetAppPermissionsChanges, - policy::AppPermissions(const std::string& policy_app_id)); MOCK_METHOD2(GetAppPermissionsChanges, policy::AppPermissions(const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD1(RemovePendingPermissionChanges, void(const std::string& app_id)); - MOCK_CONST_METHOD1(GetCurrentDeviceId, - std::string&(const std::string& policy_app_id)); MOCK_CONST_METHOD2( GetCurrentDeviceId, std::string&(const transport_manager::DeviceHandle& device_handle, @@ -166,26 +151,16 @@ class MockPolicyManager : public PolicyManager { void(const std::string& ccpu_version, const std::string& wers_country_code, const std::string& language)); - MOCK_METHOD1(SendNotificationOnPermissionsUpdated, - void(const std::string& application_id)); MOCK_METHOD2(SendNotificationOnPermissionsUpdated, void(const std::string& device_id, const std::string& application_id)); MOCK_METHOD1(MarkUnpairedDevice, void(const std::string& device_id)); - MOCK_METHOD2( - AddApplication, - StatusNotifier( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); MOCK_METHOD3( AddApplication, StatusNotifier( const std::string& device_id, const std::string& application_id, const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); - MOCK_METHOD2(SetDefaultHmiTypes, - void(const std::string& application_id, - const std::vector<int>& hmi_types)); MOCK_METHOD3(SetDefaultHmiTypes, void(const transport_manager::DeviceHandle& device_handle, const std::string& application_id, @@ -216,16 +191,11 @@ class MockPolicyManager : public PolicyManager { MOCK_METHOD1(SaveUpdateStatusRequired, void(bool is_update_needed)); MOCK_METHOD0(OnAppsSearchStarted, void()); MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu)); - MOCK_METHOD1(OnAppRegisteredOnMobile, - void(const std::string& application_id)); MOCK_METHOD2(OnAppRegisteredOnMobile, void(const std::string& device_id, const std::string& application_id)); MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string()); MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id)); - MOCK_CONST_METHOD1( - GetAppRequestTypes, - const std::vector<std::string>(const std::string policy_app_id)); MOCK_CONST_METHOD2(GetAppRequestTypes, const std::vector<std::string>( const transport_manager::DeviceHandle& device_handle, diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h index ce06fe3fbd..d0d85409a2 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h @@ -52,13 +52,6 @@ namespace custom_str = utils::custom_string; class MockPolicyListener : public ::policy::PolicyListener { public: - MOCK_METHOD2(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions)); - MOCK_METHOD3(OnPermissionsUpdated, - void(const std::string& policy_app_id, - const policy::Permissions& permissions, - const policy::HMILevel& default_hmi)); MOCK_METHOD3(OnPermissionsUpdated, void(const std::string& device_id, const std::string& policy_app_id, @@ -68,14 +61,10 @@ class MockPolicyListener : public ::policy::PolicyListener { const std::string& policy_app_id, const policy::Permissions& permissions, const policy::HMILevel& default_hmi)); - MOCK_METHOD1(OnPendingPermissionChange, - void(const std::string& policy_app_id)); MOCK_METHOD2(OnPendingPermissionChange, void(const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status)); - MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired, - std::string(const std::string& policy_app_id)); MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired, std::string(const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id)); @@ -94,8 +83,6 @@ class MockPolicyListener : public ::policy::PolicyListener { MOCK_METHOD2(OnAuthTokenUpdated, void(const std::string& policy_app_id, const std::string& auth_token)); - MOCK_CONST_METHOD2(SendOnAppPermissionsChanged, - void(const policy::AppPermissions&, const std::string&)); MOCK_CONST_METHOD3(SendOnAppPermissionsChanged, void(const policy::AppPermissions& permissions, const std::string& device_id, diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h index 2bb2eefd3d..c6e692cf0b 100644 --- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h +++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h @@ -100,8 +100,6 @@ class MockPolicyManager : public PolicyManager { std::vector<policy::FunctionalGroupPermission>& permissions)); MOCK_METHOD2(SetUserConsentForDevice, void(const std::string& device_id, const bool is_allowed)); - MOCK_METHOD2(ReactOnUserDevConsentForApp, - bool(const std::string app_id, bool is_device_allowed)); MOCK_METHOD3(ReactOnUserDevConsentForApp, bool(const transport_manager::DeviceHandle& device_handle, const std::string app_id, @@ -121,9 +119,6 @@ class MockPolicyManager : public PolicyManager { const policy::DeviceInfo& device_info)); MOCK_METHOD1(SetUserConsentForApp, void(const policy::PermissionConsent& permissions)); - MOCK_CONST_METHOD2(GetDefaultHmi, - bool(const std::string& policy_app_id, - std::string* default_hmi)); MOCK_CONST_METHOD3(GetDefaultHmi, bool(const std::string& device_id, const std::string& policy_app_id, @@ -141,14 +136,10 @@ class MockPolicyManager : public PolicyManager { void(const std::string& device_id, const std::string& policy_app_id, std::vector<policy::FunctionalGroupPermission>& permissions)); - MOCK_METHOD1(GetAppPermissionsChanges, - policy::AppPermissions(const std::string& policy_app_id)); MOCK_METHOD2(GetAppPermissionsChanges, policy::AppPermissions(const std::string& device_id, const std::string& policy_app_id)); MOCK_METHOD1(RemovePendingPermissionChanges, void(const std::string& app_id)); - MOCK_CONST_METHOD1(GetCurrentDeviceId, - std::string&(const std::string& policy_app_id)); MOCK_CONST_METHOD2( GetCurrentDeviceId, std::string&(const transport_manager::DeviceHandle& device_handle, @@ -158,26 +149,16 @@ class MockPolicyManager : public PolicyManager { void(const std::string& ccpu_version, const std::string& wers_country_code, const std::string& language)); - MOCK_METHOD1(SendNotificationOnPermissionsUpdated, - void(const std::string& application_id)); MOCK_METHOD2(SendNotificationOnPermissionsUpdated, void(const std::string& device_id, const std::string& application_id)); MOCK_METHOD1(MarkUnpairedDevice, void(const std::string& device_id)); - MOCK_METHOD2( - AddApplication, - StatusNotifier( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); MOCK_METHOD3( AddApplication, StatusNotifier( const std::string& device_id, const std::string& application_id, const rpc::policy_table_interface_base::AppHmiTypes& hmi_types)); - MOCK_METHOD2(SetDefaultHmiTypes, - void(const std::string& application_id, - const std::vector<int>& hmi_types)); MOCK_METHOD3(SetDefaultHmiTypes, void(const transport_manager::DeviceHandle& device_handle, const std::string& application_id, @@ -207,8 +188,6 @@ class MockPolicyManager : public PolicyManager { MOCK_METHOD1(SaveUpdateStatusRequired, void(bool is_update_needed)); MOCK_METHOD0(OnAppsSearchStarted, void()); MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu)); - MOCK_METHOD1(OnAppRegisteredOnMobile, - void(const std::string& application_id)); MOCK_METHOD2(OnAppRegisteredOnMobile, void(const std::string& device_id, const std::string& application_id)); 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 2ee7edf472..261f66a3b2 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 @@ -119,24 +119,6 @@ class PolicyManagerImpl : public PolicyManager { void RequestPTUpdate() OVERRIDE; /** - * DEPRECATED - * @brief Check if specified RPC for specified application - * has permission to be executed in specified HMI Level - * and also its permitted params. - * @param app_id Id of application provided during registration - * @param hmi_level Current HMI Level of application - * @param rpc Name of RPC - * @param rpc_params List of RPC params - * @param result containing flag if HMI Level is allowed - * and list of allowed params. - */ - DEPRECATED void CheckPermissions(const PTString& app_id, - const PTString& hmi_level, - const PTString& rpc, - const RPCParams& rpc_params, - CheckPermissionResult& result) OVERRIDE; - - /** * @brief Check if specified RPC for specified application * has permission to be executed in specified HMI Level * and also its permitted params. @@ -285,17 +267,6 @@ class PolicyManagerImpl : public PolicyManager { const bool is_allowed) OVERRIDE; /** - * DEPRECATED - * @brief Update Application Policies as reaction - * on User allowing/disallowing device this app is running on. - * @param app_id Unique application id - * @param is_device_allowed true if user allowing device otherwise false - * @return true if operation was successful - */ - DEPRECATED bool ReactOnUserDevConsentForApp( - const std::string& app_id, const bool is_device_allowed) OVERRIDE; - - /** * @brief Update Application Policies as reaction * on User allowing/disallowing device this app is running on. * @param device_handle device identifier @@ -348,17 +319,6 @@ class PolicyManagerImpl : public PolicyManager { const NotificationMode mode) OVERRIDE; /** - * DEPRECATED - * @brief Get default HMI level for application - * @param policy_app_id Unique application id - * @param default_hmi Default HMI level for application or empty, if value - * was not set - * @return true, if succedeed, otherwise - false - */ - DEPRECATED bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const OVERRIDE; - - /** * @brief Get default HMI level for application * @param device_id device identifier * @param policy_app_id Unique application id @@ -456,16 +416,6 @@ class PolicyManagerImpl : public PolicyManager { void SetVINValue(const std::string& value) OVERRIDE; /** - * DEPRECATED - * @brief Gets specific application permissions changes since last policy - * table update - * @param policy_app_id Unique application id - * @return Permissions changes - */ - DEPRECATED AppPermissions - GetAppPermissionsChanges(const std::string& policy_app_id) OVERRIDE; - - /** * @brief Gets specific application permissions changes since last policy * table update * @param device_id device identifier @@ -516,18 +466,6 @@ class PolicyManagerImpl : public PolicyManager { void MarkUnpairedDevice(const std::string& device_id) OVERRIDE; /** - * DEPRECATED - * @brief Adds, application to the db or update existed one - * run PTU if policy update is necessary for application. - * @param application_id Unique application id - * @param hmi_types application HMI types - * @return function that will notify update manager about new application - */ - DEPRECATED StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE; - - /** * @brief Adds, application to the db or update existed one * run PTU if policy update is necessary for application. * @param device_id device identifier @@ -541,16 +479,6 @@ class PolicyManagerImpl : public PolicyManager { const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE; /** - * DEPRECATED - * @brief Assigns new HMI types for specified application - * @param application_id Unique application id - * @param hmi_types new HMI types list - */ - DEPRECATED void SetDefaultHmiTypes( - const std::string& application_id, - const std::vector<int>& hmi_types) OVERRIDE; - - /** * @brief Assigns new HMI types for specified application * @param device_handle device identifier * @param application_id Unique application id @@ -776,17 +704,6 @@ class PolicyManagerImpl : public PolicyManager { const std::string& policy_app_id) const OVERRIDE; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED void OnAppRegisteredOnMobile( - const std::string& application_id) OVERRIDE; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -941,31 +858,6 @@ class PolicyManagerImpl : public PolicyManager { private: /** - * DEPRECATED - * @brief Gets request types for application - * @param policy_app_id Unique application id - * @return request types of application - */ - const std::vector<std::string> GetAppRequestTypes( - const std::string policy_app_id) const OVERRIDE; - - /** - * DEPRECATED - * @brief Return device id, which hosts specific application - * @param policy_app_id Application id, which is required to update device id - */ - std::string& GetCurrentDeviceId( - const std::string& policy_app_id) const OVERRIDE; - - /** - * DEPRECATED - * @brief Send OnPermissionsUpdated for choosen application - * @param application_id Unique application id - */ - void SendNotificationOnPermissionsUpdated( - const std::string& application_id) OVERRIDE; - - /** * @brief Checks if PT update should be started and schedules it if needed */ void CheckTriggers(); 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 09a2ca342c..dd33bb86ab 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -717,18 +717,6 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) { } const std::vector<std::string> PolicyManagerImpl::GetAppRequestTypes( - const std::string policy_app_id) const { - std::vector<std::string> request_types; - if (kDeviceDisallowed == - cache_->GetDeviceConsent(GetCurrentDeviceId(policy_app_id))) { - cache_->GetAppRequestTypes(kPreDataConsentId, request_types); - } else { - cache_->GetAppRequestTypes(policy_app_id, request_types); - } - return request_types; -} - -const std::vector<std::string> PolicyManagerImpl::GetAppRequestTypes( const transport_manager::DeviceHandle& device_handle, const std::string policy_app_id) const { std::vector<std::string> request_types; @@ -833,171 +821,6 @@ bool PolicyManagerImpl::UnknownRPCPassthroughAllowed( return cache_->UnknownRPCPassthroughAllowed(policy_app_id); } -void PolicyManagerImpl::CheckPermissions(const PTString& app_id, - const PTString& hmi_level, - const PTString& rpc, - const RPCParams& rpc_params, - CheckPermissionResult& result) { - LOG4CXX_INFO(logger_, - "CheckPermissions for " << app_id << " and rpc " << rpc - << " for " << hmi_level << " level."); - - const std::string device_id = GetCurrentDeviceId(app_id); - - Permissions rpc_permissions; - - // Check, if there are calculated permission present in cache - if (!cache_->IsPermissionsCalculated(device_id, app_id, rpc_permissions)) { - LOG4CXX_DEBUG(logger_, - "IsPermissionsCalculated for device: " - << device_id << " and app: " << app_id - << " returns false"); - // Get actual application group permission according to user consents - std::vector<FunctionalGroupPermission> app_group_permissions; - GetPermissionsForApp(device_id, app_id, app_group_permissions); - - // Fill struct with known groups RPCs - policy_table::FunctionalGroupings functional_groupings; - cache_->GetFunctionalGroupings(functional_groupings); - - policy_table::Strings app_groups = GetGroupsNames(app_group_permissions); - - // Undefined groups (without user consent) disallowed by default, since - // OnPermissionsChange notification has no "undefined" section - // For RPC permission checking undefinded group will be treated as separate - // type - ProcessFunctionalGroup processor(functional_groupings, - app_group_permissions, - rpc_permissions, - GroupConsent::kGroupUndefined); - std::for_each(app_groups.begin(), app_groups.end(), processor); - - cache_->AddCalculatedPermissions(device_id, app_id, rpc_permissions); - } else { - LOG4CXX_DEBUG(logger_, - "IsPermissionsCalculated for device: " - << device_id << " and app: " << app_id - << " returns true"); - } - - if (cache_->IsApplicationRevoked(app_id)) { - // SDL must be able to notify mobile side with its status after app has - // been revoked by backend - if ("OnHMIStatus" == rpc && "NONE" == hmi_level) { - result.hmi_level_permitted = kRpcAllowed; - } else { - result.hmi_level_permitted = kRpcDisallowed; - } - return; - } - - const bool known_rpc = rpc_permissions.end() != rpc_permissions.find(rpc); - LOG4CXX_DEBUG(logger_, "Is known rpc " << (known_rpc ? "true" : "false")); - if (!known_rpc) { - // RPC not found in list == disallowed by backend - result.hmi_level_permitted = kRpcDisallowed; - return; - } - - // Check HMI level - if (rpc_permissions[rpc].hmi_permissions[kAllowedKey].end() != - rpc_permissions[rpc].hmi_permissions[kAllowedKey].find(hmi_level)) { - // RPC found in allowed == allowed by backend and user - result.hmi_level_permitted = kRpcAllowed; - } else if (rpc_permissions[rpc].hmi_permissions[kUndefinedKey].end() != - rpc_permissions[rpc].hmi_permissions[kUndefinedKey].find( - hmi_level)) { - // RPC found in undefined == allowed by backend, but not consented yet by - // user - result.hmi_level_permitted = kRpcDisallowed; - } else if (rpc_permissions[rpc].hmi_permissions[kUserDisallowedKey].end() != - rpc_permissions[rpc].hmi_permissions[kUserDisallowedKey].find( - hmi_level)) { - // RPC found in allowed == allowed by backend, but disallowed by user - LOG4CXX_DEBUG( - logger_, - "RPC found in allowed == allowed by backend, but disallowed by user"); - result.hmi_level_permitted = kRpcUserDisallowed; - } else { - LOG4CXX_DEBUG(logger_, - "HMI level " << hmi_level << " wasn't found " - << " for rpc " << rpc << " and appID " - << app_id); - return; - } - - if (kRpcAllowed != result.hmi_level_permitted) { - LOG4CXX_DEBUG(logger_, "RPC is not allowed. Stop parameters processing."); - result.list_of_allowed_params = - rpc_permissions[rpc].parameter_permissions[kAllowedKey]; - - result.list_of_disallowed_params = - rpc_permissions[rpc].parameter_permissions[kUserDisallowedKey]; - - result.list_of_undefined_params = - rpc_permissions[rpc].parameter_permissions[kUndefinedKey]; - return; - } - - // Considered that items disallowed by user take priority over system (policy) - // permissions, so that flag is processed first - if (rpc_permissions[rpc] - .parameter_permissions.any_parameter_disallowed_by_user) { - LOG4CXX_DEBUG(logger_, "All parameters are disallowed by user."); - result.list_of_disallowed_params = rpc_params; - result.hmi_level_permitted = kRpcUserDisallowed; - return; - } - - if (rpc_permissions[rpc] - .parameter_permissions.any_parameter_disallowed_by_policy) { - LOG4CXX_DEBUG(logger_, "All parameters are disallowed by policy."); - result.list_of_undefined_params = rpc_params; - result.hmi_level_permitted = kRpcDisallowed; - return; - } - - if (rpc_permissions[rpc].parameter_permissions.any_parameter_allowed) { - LOG4CXX_DEBUG(logger_, "All parameters are allowed."); - result.list_of_allowed_params = rpc_params; - return; - } - - result.list_of_allowed_params = - rpc_permissions[rpc].parameter_permissions[kAllowedKey]; - - result.list_of_disallowed_params = - rpc_permissions[rpc].parameter_permissions[kUserDisallowedKey]; - - result.list_of_undefined_params = - rpc_permissions[rpc].parameter_permissions[kUndefinedKey]; - - // In case of some parameters of RPC are missing in current policy table - // they will be considered as disallowed by policy itself, not by user. - // Undefined parameters contain parameters present in policy table, but which - // have not been allowed or disallowed explicitly by user, so missing params - // are being added to undefined. - RPCParams::const_iterator parameter = rpc_params.begin(); - RPCParams::const_iterator end = rpc_params.end(); - for (; end != parameter; ++parameter) { - if (!result.HasParameter(*parameter)) { - LOG4CXX_DEBUG(logger_, - "Parameter " << *parameter - << " is unknown." - " Adding to undefined list."); - result.list_of_undefined_params.insert(*parameter); - } - } - - if (result.DisallowedInclude(rpc_params)) { - LOG4CXX_DEBUG(logger_, "All parameters are disallowed."); - result.hmi_level_permitted = kRpcUserDisallowed; - } else if (!result.IsAnyAllowed(rpc_params)) { - LOG4CXX_DEBUG(logger_, "There are no parameters allowed."); - result.hmi_level_permitted = kRpcDisallowed; - } -} - void PolicyManagerImpl::CheckPermissions(const PTString& device_id, const PTString& app_id, const PTString& hmi_level, @@ -1177,49 +1000,6 @@ policy_table::Strings PolicyManagerImpl::GetGroupsNames( } void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( - const std::string& application_id) { - LOG4CXX_AUTO_TRACE(logger_); - const std::string device_id = GetCurrentDeviceId(application_id); - if (device_id.empty()) { - LOG4CXX_WARN(logger_, - "Couldn't find device info for application id " - "'" << application_id - << "'"); - return; - } - - std::vector<FunctionalGroupPermission> app_group_permissions; - GetPermissionsForApp(device_id, application_id, app_group_permissions); - - policy_table::FunctionalGroupings functional_groupings; - cache_->GetFunctionalGroupings(functional_groupings); - - policy_table::Strings app_groups = GetGroupsNames(app_group_permissions); - - Permissions notification_data; - PrepareNotificationData(functional_groupings, - app_groups, - app_group_permissions, - notification_data); - - LOG4CXX_INFO(logger_, - "Send notification for application_id: " << application_id); - - const ApplicationOnDevice who = {device_id, application_id}; - if (access_remote_->IsAppRemoteControl(who)) { - listener()->OnPermissionsUpdated( - device_id, application_id, notification_data); - return; - } - - std::string default_hmi; - GetDefaultHmi(device_id, application_id, &default_hmi); - - listener()->OnPermissionsUpdated( - device_id, application_id, notification_data, default_hmi); -} - -void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( const std::string& device_id, const std::string& application_id) { LOG4CXX_AUTO_TRACE(logger_); if (device_id.empty()) { @@ -1291,51 +1071,6 @@ void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id, } bool PolicyManagerImpl::ReactOnUserDevConsentForApp( - const std::string& app_id, const bool is_device_allowed) { - std::vector<std::string> current_request_types = GetAppRequestTypes(app_id); - std::string current_priority, new_priority; - GetPriority(app_id, ¤t_priority); - - bool result = cache_->ReactOnUserDevConsentForApp(app_id, is_device_allowed); - - std::vector<std::string> new_request_types = GetAppRequestTypes(app_id); - GetPriority(app_id, &new_priority); - std::sort(current_request_types.begin(), current_request_types.end()); - std::sort(new_request_types.begin(), new_request_types.end()); - - std::vector<std::string> diff; - std::set_symmetric_difference(current_request_types.begin(), - current_request_types.end(), - new_request_types.begin(), - new_request_types.end(), - std::back_inserter(diff)); - - AppPermissions permissions(app_id); - - if (!diff.empty()) { - permissions.requestType = new_request_types; - permissions.requestTypeChanged = true; - } - - if ((!current_priority.empty()) && (!new_priority.empty()) && - (current_priority != new_priority)) { - permissions.priority = new_priority; - } - - if (permissions.requestTypeChanged || (!permissions.priority.empty())) { - const auto devices_ids = listener()->GetDevicesIds(app_id); - if (devices_ids.size() == 0) { - LOG4CXX_WARN(logger_, - "Could not find device info for app_id: " << app_id); - return false; - } - listener_->SendOnAppPermissionsChanged( - permissions, devices_ids.back(), app_id); - } - return result; -} - -bool PolicyManagerImpl::ReactOnUserDevConsentForApp( const transport_manager::DeviceHandle& device_handle, const std::string& app_id, const bool is_device_allowed) { @@ -1549,17 +1284,6 @@ void PolicyManagerImpl::SetUserConsentForApp( updated_app_group_permissons); } -bool PolicyManagerImpl::GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const { - LOG4CXX_AUTO_TRACE(logger_); - const std::string device_id = GetCurrentDeviceId(policy_app_id); - DeviceConsent device_consent = GetUserConsentForDevice(device_id); - const std::string app_id = policy::kDeviceAllowed != device_consent - ? kPreDataConsentId - : policy_app_id; - return cache_->GetDefaultHMI(app_id, *default_hmi); -} - bool PolicyManagerImpl::GetDefaultHmi(const std::string& device_id, const std::string& policy_app_id, std::string* default_hmi) const { @@ -1758,19 +1482,6 @@ void PolicyManagerImpl::GetPermissionsForApp( } std::string& PolicyManagerImpl::GetCurrentDeviceId( - const std::string& policy_app_id) const { - LOG4CXX_INFO(logger_, "GetDeviceInfo"); - const auto devices_ids = listener()->GetDevicesIds(policy_app_id); - if (devices_ids.size() == 0) { - LOG4CXX_WARN(logger_, - "Could not find device info for app_id: " << policy_app_id); - return last_device_id_; - } - last_device_id_ = devices_ids.back(); - return last_device_id_; -} - -std::string& PolicyManagerImpl::GetCurrentDeviceId( const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id) const { LOG4CXX_INFO(logger_, "GetDeviceInfo"); @@ -2185,27 +1896,6 @@ void PolicyManagerImpl::SetVINValue(const std::string& value) { } AppPermissions PolicyManagerImpl::GetAppPermissionsChanges( - const std::string& policy_app_id) { - PendingPermissions::iterator app_id_diff = - app_permissions_diff_.find(policy_app_id); - - AppPermissions permissions(policy_app_id); - - if (app_permissions_diff_.end() != app_id_diff) { - permissions = app_id_diff->second; - } else { - const auto devices_ids = listener()->GetDevicesIds(policy_app_id); - const auto device_id = - devices_ids.size() ? devices_ids.back() : last_device_id_; - permissions.appPermissionsConsentNeeded = - IsConsentNeeded(device_id, policy_app_id); - permissions.appRevoked = IsApplicationRevoked(policy_app_id); - GetPriority(permissions.application_id, &permissions.priority); - } - return permissions; -} - -AppPermissions PolicyManagerImpl::GetAppPermissionsChanges( const std::string& device_id, const std::string& policy_app_id) { PendingPermissions::iterator app_id_diff = app_permissions_diff_.find(policy_app_id); @@ -2245,12 +1935,6 @@ void PolicyManagerImpl::MarkUnpairedDevice(const std::string& device_id) { } void PolicyManagerImpl::OnAppRegisteredOnMobile( - const std::string& application_id) { - StartPTExchange(); - SendNotificationOnPermissionsUpdated(application_id); -} - -void PolicyManagerImpl::OnAppRegisteredOnMobile( const std::string& device_id, const std::string& application_id) { StartPTExchange(); SendNotificationOnPermissionsUpdated(device_id, application_id); @@ -2342,27 +2026,6 @@ class CallStatusChange : public utils::Callable { }; StatusNotifier PolicyManagerImpl::AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) { - LOG4CXX_AUTO_TRACE(logger_); - const auto devices_ids = listener()->GetDevicesIds(application_id); - const auto device_id = - devices_ids.size() ? devices_ids.back() : last_device_id_; - DeviceConsent device_consent = GetUserConsentForDevice(device_id); - sync_primitives::AutoLock lock(apps_registration_lock_); - if (IsNewApplication(application_id)) { - LOG4CXX_DEBUG(logger_, "Adding new application"); - AddNewApplication(device_id, application_id, device_consent); - return std::make_shared<CallStatusChange>(update_status_manager_, - device_consent); - } - LOG4CXX_DEBUG(logger_, "Promote existed application"); - PromoteExistedApplication(device_id, application_id, device_consent); - update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired()); - return std::make_shared<utils::CallNothing>(); -} - -StatusNotifier PolicyManagerImpl::AddApplication( const std::string& device_id, const std::string& application_id, const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) { @@ -2541,14 +2204,6 @@ std::ostream& operator<<(std::ostream& output, return output; } -void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id, - const std::vector<int>& hmi_types) { - LOG4CXX_INFO(logger_, "SetDefaultHmiTypes"); - const std::string device_id = GetCurrentDeviceId(application_id); - ApplicationOnDevice who = {device_id, application_id}; - access_remote_->SetDefaultHmiTypes(who, hmi_types); -} - void PolicyManagerImpl::SetDefaultHmiTypes( const transport_manager::DeviceHandle& device_handle, const std::string& application_id, diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_test.cc index 93ed44618c..b809c83d75 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test.cc @@ -532,7 +532,7 @@ TEST_F( EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data); EXPECT_CALL(listener_, OnPermissionsUpdated(device_id_1_, app_id_1_, _)); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_1_)) .WillRepeatedly(Return(device_id_1_)); policy_manager_->AddApplication( @@ -600,7 +600,7 @@ TEST_F( EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data); EXPECT_CALL(listener_, OnPermissionsUpdated(device_id_1_, app_id_1_, _)); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_1_)) .WillRepeatedly(Return(device_id_1_)); policy_manager_->AddApplication( diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc index 8636c29f0d..8a62772992 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc @@ -342,7 +342,7 @@ void PolicyManagerImplTest2::AddRTtoAppSectionPT( // section pt_request_types_ = policy_manager_->GetAppRequestTypes(handle, section_name); EXPECT_EQ(rt_number, pt_request_types_.size()); - EXPECT_CALL(listener_, OnPendingPermissionChange(section_name)).Times(1); + EXPECT_CALL(listener_, OnPendingPermissionChange(_, section_name)).Times(1); Json::Value root = GetPTU(update_file_name); // Get App Request Types from PTU diff --git a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc index d1e25b770c..e42ecbacd7 100644 --- a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc +++ b/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc @@ -50,7 +50,7 @@ TEST_F( // Arrange CreateLocalPT(preloaded_pt_filename_); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_1_)) .WillRepeatedly(Return(device_id_1_)); policy_manager_->SetUserConsentForDevice(device_id_1_, true); @@ -220,7 +220,7 @@ TEST_F( policy_manager_->AddApplication( device_id_1_, app_id_1_, HmiTypes(policy_table::AHT_DEFAULT)); ASSERT_TRUE(policy_manager_->IsPredataPolicy(app_id_1_)); - EXPECT_CALL(listener_, OnPendingPermissionChange(app_id_1_)).Times(0); + EXPECT_CALL(listener_, OnPendingPermissionChange(_, app_id_1_)).Times(0); policy_manager_->ReactOnUserDevConsentForApp(handle, app_id_1_, true); EXPECT_FALSE(policy_manager_->IsPredataPolicy(app_id_1_)); EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_1_)); @@ -308,7 +308,7 @@ TEST_F(PolicyManagerImplTest2, policy_manager_->GetUserConsentForDevice(device_id_2_); // Check EXPECT_EQ(::policy::DeviceConsent::kDeviceDisallowed, consent); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_2_)) .WillRepeatedly(Return(device_id_2_)); policy_manager_->AddApplication( device_id_2_, app_id_2_, HmiTypes(policy_table::AHT_DEFAULT)); @@ -344,7 +344,7 @@ TEST_F(PolicyManagerImplTest2, policy_manager_->GetUserConsentForDevice(device_id_2_); // Check EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_2_)) .WillRepeatedly(Return(device_id_2_)); policy_manager_->AddApplication( device_id_2_, app_id_2_, HmiTypes(policy_table::AHT_DEFAULT)); @@ -381,7 +381,7 @@ TEST_F(PolicyManagerImplTest2, policy_manager_->GetUserConsentForDevice(device_id_2_); // Check EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_2_)) .WillRepeatedly(Return(device_id_2_)); policy_manager_->AddApplication( device_id_2_, app_id_2_, HmiTypes(policy_table::AHT_DEFAULT)); @@ -576,7 +576,7 @@ TEST_F(PolicyManagerImplTest2, ::policy::DeviceConsent consent = policy_manager_->GetUserConsentForDevice(device_id_2_); EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_2_)) .WillRepeatedly(Return(device_id_2_)); policy_manager_->AddApplication( device_id_2_, app_id_2_, HmiTypes(policy_table::AHT_DEFAULT)); @@ -618,7 +618,7 @@ TEST_F(PolicyManagerImplTest2, ::policy::DeviceConsent consent = policy_manager_->GetUserConsentForDevice(device_id_2_); EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)) + EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(_, app_id_2_)) .WillRepeatedly(Return(device_id_2_)); policy_manager_->AddApplication( device_id_2_, app_id_2_, HmiTypes(policy_table::AHT_DEFAULT)); 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 8f2afb6174..903f7820d2 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 @@ -263,17 +263,6 @@ class PolicyManagerImpl : public PolicyManager { const bool is_allowed) OVERRIDE; /** - * DEPRECATED - * @brief Update Application Policies as reaction - * on User allowing/disallowing device this app is running on. - * @param app_id Unique application id - * @param is_device_allowed true if user allowing device otherwise false - * @return true if operation was successful - */ - DEPRECATED bool ReactOnUserDevConsentForApp( - const std::string app_id, const bool is_device_allowed) OVERRIDE; - - /** * @brief Update Application Policies as reaction * on User allowing/disallowing device this app is running on. * @param device_handle device identifier @@ -324,17 +313,6 @@ class PolicyManagerImpl : public PolicyManager { void SetUserConsentForApp(const PermissionConsent& permissions) OVERRIDE; /** - * DEPRECATED - * @brief Get default HMI level for application - * @param policy_app_id Unique application id - * @param default_hmi Default HMI level for application or empty, if value - * was not set - * @return true, if succedeed, otherwise - false - */ - DEPRECATED bool GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const OVERRIDE; - - /** * @brief Get default HMI level for application * @param device_id device identifier * @param policy_app_id Unique application id @@ -430,16 +408,6 @@ class PolicyManagerImpl : public PolicyManager { void SetVINValue(const std::string& value) OVERRIDE; /** - * DEPRECATED - * @brief Gets specific application permissions changes since last policy - * table update - * @param policy_app_id Unique application id - * @return Permissions changes - */ - DEPRECATED AppPermissions - GetAppPermissionsChanges(const std::string& policy_app_id) OVERRIDE; - - /** * @brief Gets specific application permissions changes since last policy * table update * @param device_id device identifier @@ -490,18 +458,6 @@ class PolicyManagerImpl : public PolicyManager { void MarkUnpairedDevice(const std::string& device_id) OVERRIDE; /** - * DEPRECATED - * @brief Adds, application to the db or update existed one - * run PTU if policy update is necessary for application. - * @param application_id Unique application id - * @param hmi_types application HMI types - * @return function that will notify update manager about new application - */ - DEPRECATED StatusNotifier AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE; - - /** * @brief Adds, application to the db or update existed one * run PTU if policy update is necessary for application. * @param device_id device identifier @@ -515,16 +471,6 @@ class PolicyManagerImpl : public PolicyManager { const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE; /** - * DEPRECATED - * @brief Assigns new HMI types for specified application - * @param application_id Unique application id - * @param hmi_types new HMI types list - */ - DEPRECATED void SetDefaultHmiTypes( - const std::string& application_id, - const std::vector<int>& hmi_types) OVERRIDE; - - /** * @brief Assigns new HMI types for specified application * @param device_handle device identifier * @param application_id Unique application id @@ -749,17 +695,6 @@ class PolicyManagerImpl : public PolicyManager { const std::string& policy_app_id) const OVERRIDE; /** - * DEPRECATED - * @brief OnAppRegisteredOnMobile allows to handle event when application were - * succesfully registered on mobile device. - * It will send OnAppPermissionSend notification and will try to start PTU. - * - * @param application_id registered application. - */ - DEPRECATED void OnAppRegisteredOnMobile( - const std::string& application_id) OVERRIDE; - - /** * @brief OnAppRegisteredOnMobile allows to handle event when application were * succesfully registered on mobile device. * It will send OnAppPermissionSend notification and will try to start PTU. @@ -888,22 +823,6 @@ class PolicyManagerImpl : public PolicyManager { private: /** - * DEPRECATED - * @brief Return device id, which hosts specific application - * @param policy_app_id Application id, which is required to update device id - */ - std::string& GetCurrentDeviceId( - const std::string& policy_app_id) const OVERRIDE; - - /** - * DEPRECATED - * @brief Send OnPermissionsUpdated for choosen application - * @param application_id Unique application id - */ - void SendNotificationOnPermissionsUpdated( - const std::string& application_id) OVERRIDE; - - /** * @brief Checks if PT update should be started and schedules it if needed */ void CheckTriggers(); @@ -987,14 +906,6 @@ class PolicyManagerImpl : public PolicyManager { bool CheckAppStorageFolder() const; /** - * DEPRECATED - * @brief Checks whether need ask the permission of users - * @param app_id policy application id - * @return true if user consent is needed - */ - virtual bool IsConsentNeeded(const std::string& app_id); - - /** * @brief Checks whether need ask the permission of users * @param device_id device identifier * @param app_id policy application id 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 15d895583a..8bfa001293 100644 --- a/src/components/policy/policy_regular/src/policy_manager_impl.cc +++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc @@ -526,12 +526,6 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) { } void PolicyManagerImpl::OnAppRegisteredOnMobile( - const std::string& application_id) { - StartPTExchange(); - SendNotificationOnPermissionsUpdated(application_id); -} - -void PolicyManagerImpl::OnAppRegisteredOnMobile( const std::string& device_id, const std::string& application_id) { StartPTExchange(); SendNotificationOnPermissionsUpdated(device_id, application_id); @@ -687,56 +681,6 @@ bool PolicyManagerImpl::ResetUserConsent() { } void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( - const std::string& application_id) { - LOG4CXX_AUTO_TRACE(logger_); - const std::string device_id = GetCurrentDeviceId(application_id); - if (device_id.empty()) { - LOG4CXX_WARN(logger_, - "Couldn't find device info for application id " - "'" << application_id - << "'"); - return; - } - - std::vector<FunctionalGroupPermission> app_group_permissions; - GetPermissionsForApp(device_id, application_id, app_group_permissions); - - policy_table::FunctionalGroupings functional_groupings; - cache_->GetFunctionalGroupings(functional_groupings); - - policy_table::Strings app_groups; - std::vector<FunctionalGroupPermission>::const_iterator it = - app_group_permissions.begin(); - std::vector<FunctionalGroupPermission>::const_iterator it_end = - app_group_permissions.end(); - for (; it != it_end; ++it) { - app_groups.push_back((*it).group_name); - } - - Permissions notification_data; - PrepareNotificationData(functional_groupings, - app_groups, - app_group_permissions, - notification_data); - - LOG4CXX_INFO(logger_, - "Send notification for application_id:" << application_id); - - std::string default_hmi; - default_hmi = "NONE"; - - const ApplicationOnDevice who = {device_id, application_id}; - if (access_remote_->IsAppRemoteControl(who)) { - listener()->OnPermissionsUpdated( - device_id, application_id, notification_data); - return; - } - - listener()->OnPermissionsUpdated( - device_id, application_id, notification_data, default_hmi); -} - -void PolicyManagerImpl::SendNotificationOnPermissionsUpdated( const std::string& device_id, const std::string& application_id) { LOG4CXX_AUTO_TRACE(logger_); @@ -800,14 +744,6 @@ void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id, } } -bool PolicyManagerImpl::ReactOnUserDevConsentForApp(const std::string app_id, - bool is_device_allowed) { - UNUSED(app_id); - UNUSED(is_device_allowed); - - return true; -} - bool PolicyManagerImpl::ReactOnUserDevConsentForApp( const transport_manager::DeviceHandle& device_handle, const std::string app_id, @@ -925,17 +861,6 @@ void PolicyManagerImpl::SetUserConsentForApp( LOG4CXX_AUTO_TRACE(logger_); } -bool PolicyManagerImpl::GetDefaultHmi(const std::string& policy_app_id, - std::string* default_hmi) const { - LOG4CXX_AUTO_TRACE(logger_); - const std::string device_id = GetCurrentDeviceId(policy_app_id); - DeviceConsent device_consent = GetUserConsentForDevice(device_id); - const std::string app_id = policy::kDeviceAllowed != device_consent - ? kPreDataConsentId - : policy_app_id; - return cache_->GetDefaultHMI(app_id, *default_hmi); -} - bool PolicyManagerImpl::GetDefaultHmi(const std::string& device_id, const std::string& policy_app_id, std::string* default_hmi) const { @@ -1078,14 +1003,6 @@ void PolicyManagerImpl::GetPermissionsForApp( } std::string& PolicyManagerImpl::GetCurrentDeviceId( - const std::string& policy_app_id) const { - LOG4CXX_AUTO_TRACE(logger_); - const auto devices_ids = listener()->GetDevicesIds(policy_app_id); - last_device_id_ = devices_ids.size() ? devices_ids.back() : last_device_id_; - return last_device_id_; -} - -std::string& PolicyManagerImpl::GetCurrentDeviceId( const transport_manager::DeviceHandle& device_handle, const std::string& policy_app_id) const { LOG4CXX_AUTO_TRACE(logger_); @@ -1280,11 +1197,6 @@ bool PolicyManagerImpl::IsApplicationRevoked(const std::string& app_id) const { return cache_->IsApplicationRevoked(app_id); } -bool PolicyManagerImpl::IsConsentNeeded(const std::string& app_id) { - LOG4CXX_AUTO_TRACE(logger_); - return false; -} - bool PolicyManagerImpl::IsConsentNeeded(const std::string& device_id, const std::string& app_id) { LOG4CXX_AUTO_TRACE(logger_); @@ -1294,21 +1206,6 @@ bool PolicyManagerImpl::IsConsentNeeded(const std::string& device_id, void PolicyManagerImpl::SetVINValue(const std::string& value) {} AppPermissions PolicyManagerImpl::GetAppPermissionsChanges( - const std::string& policy_app_id) { - typedef std::map<std::string, AppPermissions>::iterator PermissionsIt; - PermissionsIt app_id_diff = app_permissions_diff_.find(policy_app_id); - AppPermissions permissions(policy_app_id); - if (app_permissions_diff_.end() != app_id_diff) { - permissions = app_id_diff->second; - } else { - permissions.appPermissionsConsentNeeded = IsConsentNeeded(policy_app_id); - permissions.appRevoked = IsApplicationRevoked(policy_app_id); - GetPriority(permissions.application_id, &permissions.priority); - } - return permissions; -} - -AppPermissions PolicyManagerImpl::GetAppPermissionsChanges( const std::string& device_id, const std::string& policy_app_id) { typedef std::map<std::string, AppPermissions>::iterator PermissionsIt; PermissionsIt app_id_diff = app_permissions_diff_.find(policy_app_id); @@ -1405,23 +1302,6 @@ class CallStatusChange : public utils::Callable { }; StatusNotifier PolicyManagerImpl::AddApplication( - const std::string& application_id, - const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) { - LOG4CXX_AUTO_TRACE(logger_); - const std::string device_id = GetCurrentDeviceId(application_id); - DeviceConsent device_consent = GetUserConsentForDevice(device_id); - sync_primitives::AutoLock lock(apps_registration_lock_); - if (IsNewApplication(application_id)) { - AddNewApplication(application_id, device_consent); - return std::make_shared<CallStatusChange>(update_status_manager_, - device_consent); - } - PromoteExistedApplication(application_id, device_consent); - update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired()); - return std::make_shared<utils::CallNothing>(); -} - -StatusNotifier PolicyManagerImpl::AddApplication( const std::string& device_id, const std::string& application_id, const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) { @@ -1554,14 +1434,6 @@ void PolicyManagerImpl::RetrySequence() { timer_retry_sequence_.Start(timeout_msec, timer::kPeriodic); } -void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id, - const std::vector<int>& hmi_types) { - LOG4CXX_INFO(logger_, "SetDefaultHmiTypes"); - const std::string device_id = GetCurrentDeviceId(application_id); - ApplicationOnDevice who = {device_id, application_id}; - access_remote_->SetDefaultHmiTypes(who, hmi_types); -} - void PolicyManagerImpl::SetDefaultHmiTypes( const transport_manager::DeviceHandle& device_handle, const std::string& application_id, diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc index 48afc16226..3b07506981 100644 --- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc +++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc @@ -282,7 +282,7 @@ class PolicyManagerImplTest2 : public ::testing::Test { // section PT_request_types = manager->GetAppRequestTypes(section_name); EXPECT_EQ(rt_number, PT_request_types.size()); - EXPECT_CALL(listener, OnPendingPermissionChange(section_name)).Times(1); + EXPECT_CALL(listener, OnPendingPermissionChange(_, section_name)).Times(1); Json::Value root = GetPTU(update_file_name); // Get App Request Types from PTU @@ -543,7 +543,7 @@ TEST_F(PolicyManagerImplTest2, "Life", 2, "Bluetooth"); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id1)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id1)) .WillRepeatedly(Return(dev_id1)); manager->SetUserConsentForDevice(dev_id1, true); // Add app from consented device. App will be assigned with default policies @@ -603,7 +603,7 @@ TEST_F(PolicyManagerImplTest2, "Life", 2, "Bluetooth")); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired("1234")) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, "1234")) .WillRepeatedly(Return(dev_id1)); manager->SetUserConsentForDevice(dev_id1, true); // Add app from consented device. App will be assigned with default policies @@ -824,7 +824,7 @@ TEST_F( manager->AddApplication( dev_id1, app_id1, HmiTypes(policy_table::AHT_DEFAULT)); EXPECT_FALSE(manager->IsPredataPolicy(app_id1)); - EXPECT_CALL(listener, OnPendingPermissionChange(app_id1)).Times(0); + EXPECT_CALL(listener, OnPendingPermissionChange(_, app_id1)).Times(0); manager->ReactOnUserDevConsentForApp(dev_handle1, app_id1, true); EXPECT_FALSE(manager->IsPredataPolicy(app_id1)); EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id1)); @@ -1121,7 +1121,7 @@ TEST_F(PolicyManagerImplTest2, ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2); // Check EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id2)) .WillRepeatedly(Return(dev_id2)); manager->AddApplication( dev_id2, app_id2, HmiTypes(policy_table::AHT_DEFAULT)); @@ -1156,7 +1156,7 @@ TEST_F(PolicyManagerImplTest2, ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2); // Check EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id2)) .WillRepeatedly(Return(dev_id2)); manager->AddApplication( dev_id2, app_id2, HmiTypes(policy_table::AHT_DEFAULT)); @@ -1241,7 +1241,7 @@ TEST_F(PolicyManagerImplTest2, manager->SetUserConsentForDevice(dev_id2, true); ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2); EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id2)) .WillRepeatedly(Return(dev_id2)); manager->AddApplication( dev_id2, app_id2, HmiTypes(policy_table::AHT_DEFAULT)); @@ -1282,7 +1282,7 @@ TEST_F(PolicyManagerImplTest2, manager->SetUserConsentForDevice(dev_id2, true); ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2); EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id2)) .WillRepeatedly(Return(dev_id2)); manager->AddApplication( dev_id2, app_id2, HmiTypes(policy_table::AHT_DEFAULT)); @@ -1354,7 +1354,7 @@ TEST_F( ->SetUserPermissionsForDevice( dev_id2, consented_groups, disallowed_groups); manager->SetUserConsentForDevice(dev_id2, true); - EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)) + EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(_, app_id2)) .WillRepeatedly(Return(dev_id2)); manager->AddApplication( dev_id2, app_id2, HmiTypes(policy_table::AHT_DEFAULT)); |