summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Dickow <jjdickow@gmail.com>2015-01-28 15:44:04 -0500
committerJustin Dickow <jjdickow@gmail.com>2015-01-28 15:44:04 -0500
commit1842499868ca5a90c95aea4479d6aacfd1a152c9 (patch)
tree9544bc4dfaa044b59789f7930d4f523cbf8397fe
parent1bb9c8e9b3b7ab2415a9ca2d3b40e83668d2f406 (diff)
downloadsdl_core-1842499868ca5a90c95aea4479d6aacfd1a152c9.tar.gz
Fixes #23, removes all lock screen related code that was accidentally merged into master
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
-rw-r--r--src/components/application_manager/src/commands/mobile/register_app_interface_request.cc4
-rw-r--r--src/components/application_manager/src/message_helper.cc27
-rw-r--r--src/components/interfaces/MOBILE_API.xml1
3 files changed, 0 insertions, 32 deletions
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">