diff options
author | Mick Wollman <mick.wollman@gmail.com> | 2015-02-18 08:41:51 -0500 |
---|---|---|
committer | Mick Wollman <mick.wollman@gmail.com> | 2015-02-18 08:41:51 -0500 |
commit | e35533df5fa5080e8d1907b075478196beed039f (patch) | |
tree | ed931723dd8d1d8c6c4abf96f8120d7d3e9f9fd5 | |
parent | 963af3b12e730d2d89e8674a7105d6af4e468d02 (diff) | |
parent | 5d54fc8a0c0dabb76216c2c8130f385cad870c06 (diff) | |
download | sdl_core-e35533df5fa5080e8d1907b075478196beed039f.tar.gz |
Merge hotfix/remove_lock_screen_code into develop
4 files changed, 0 insertions, 42 deletions
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h index 2fc69d8162..6bfc36e093 100644 --- a/src/components/application_manager/include/application_manager/message_helper.h +++ b/src/components/application_manager/include/application_manager/message_helper.h @@ -102,16 +102,6 @@ class MessageHelper { static smart_objects::SmartObject* GetHashUpdateNotification(const uint32_t app_id); /** - * @brief Create OnSystemRequest notification for lock screen icon url - */ - static smart_objects::SmartObject* GetLockScreenIconUrlNotification(const uint32_t connection_key); - - /** - * @brief Send the OnSystemRequest notification for lock screen icon url to the mobile device - */ - static void SendLockScreenIconUrlNotification(const uint32_t connection_key); - - /** * @brief Sends to mobile HashUpdateNotification */ static void SendHashUpdateNotification(const uint32_t app_id); diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc index 1092a06915..a035e86f2d 100644 --- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc +++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc @@ -281,10 +281,6 @@ void RegisterAppInterfaceRequest::Run() { device_info); SendRegisterAppInterfaceResponseToMobile(); - - //MessageHelper::SendLockScreenIconUrlNotification( - //(*message_)[strings::params][strings::connection_key].asInt()); - policy::PolicyHandler::instance()->PTExchangeAtRegistration(mobile_app_id); } } diff --git a/src/components/application_manager/src/message_helper.cc b/src/components/application_manager/src/message_helper.cc index d0d967b8ab..ffde928db6 100644 --- a/src/components/application_manager/src/message_helper.cc +++ b/src/components/application_manager/src/message_helper.cc @@ -383,33 +383,6 @@ smart_objects::SmartObject* MessageHelper::GetHashUpdateNotification( return message; } -smart_objects::SmartObject* MessageHelper::GetLockScreenIconUrlNotification(const uint32_t connection_key) { - ApplicationSharedPtr app = ApplicationManagerImpl::instance()->application(connection_key); - DCHECK(app.get()); - - smart_objects::SmartObject* message = new smart_objects::SmartObject(smart_objects::SmartType_Map); - (*message)[strings::params][strings::function_id] = mobile_apis::FunctionID::OnSystemRequestID; - (*message)[strings::params][strings::connection_key] = connection_key; - (*message)[strings::params][strings::message_type] = mobile_apis::messageType::notification; - (*message)[strings::params][strings::protocol_type] = commands::CommandImpl::mobile_protocol_type_; - (*message)[strings::params][strings::protocol_version] = commands::CommandImpl::protocol_version_; - - (*message)[strings::msg_params][strings::request_type] = mobile_apis::RequestType::LOCK_SCREEN_ICON_URL; - - (*message)[strings::msg_params][strings::url] = - "http://www.livioconnect.com/wp-content/uploads/2012/03/icon-Livio-Connect.png"; - - return message; -} - -void MessageHelper::SendLockScreenIconUrlNotification(const uint32_t connection_key) { - LOG4CXX_INFO(logger_, "SendLockScreenIconUrlNotification"); - - smart_objects::SmartObject* so = GetLockScreenIconUrlNotification(connection_key); - PrintSmartObject(*so); - DCHECK(ApplicationManagerImpl::instance()->ManageMobileCommand(so)); -} - void MessageHelper::SendHashUpdateNotification(const uint32_t app_id) { LOG4CXX_INFO(logger_, "SendHashUpdateNotification"); diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index fa0eedbde7..7a652bb233 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -2100,7 +2100,6 @@ <element name="AUTH_CHALLENGE" /> <element name="AUTH_ACK" /> <element name="PROPRIETARY" /> - <element name="LOCK_SCREEN_ICON_URL" /> </enum> <enum name="AppHMIType"> |