diff options
12 files changed, 30 insertions, 30 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc index 86f7fb25b4..1a104c0fa1 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc @@ -161,7 +161,7 @@ void OnBCSystemCapabilityUpdatedNotification::Run() { [strings::app_services_capabilities] = app_service_caps; break; } - case mobile_apis::SystemCapabilityType::DISPLAY: { + case mobile_apis::SystemCapabilityType::DISPLAYS: { if (!hmi_capabilities_.system_display_capabilities()) { LOG4CXX_INFO(logger_, "system_display_capabilities are not available"); return; diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc index 863e31bae6..472d6dc264 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc @@ -106,7 +106,7 @@ void OnBCSystemCapabilityUpdatedNotificationFromHMI::Run() { const auto& system_capability = (*message_)[strings::msg_params][strings::system_capability]; - if (mobile_apis::SystemCapabilityType::DISPLAY == + if (mobile_apis::SystemCapabilityType::DISPLAYS == system_capability[strings::system_capability_type].asInt() && system_capability.keyExists(strings::display_capabilities)) { const auto result = ProcessSystemDisplayCapabilities( diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc index 5aca122508..d8b50e20d0 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc @@ -152,7 +152,7 @@ void GetSystemCapabilityRequest::Run() { all_services); break; } - case mobile_apis::SystemCapabilityType::DISPLAY: { + case mobile_apis::SystemCapabilityType::DISPLAYS: { auto capabilities = hmi_capabilities.system_display_capabilities(); if (app->display_capabilities()) { capabilities = app->display_capabilities().get(); @@ -174,8 +174,8 @@ void GetSystemCapabilityRequest::Run() { } const char* info = nullptr; - // Ignore subscription/unsubscription for DISPLAY type - if (mobile_apis::SystemCapabilityType::DISPLAY != response_type) { + // Ignore subscription/unsubscription for DISPLAYS type + if (mobile_apis::SystemCapabilityType::DISPLAYS != response_type) { if ((*message_)[app_mngr::strings::msg_params].keyExists( strings::subscribe)) { auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc index e4951a090a..26d6fea164 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc @@ -129,7 +129,7 @@ void OnSystemCapabilityUpdatedNotification::Run() { break; } - case mobile_apis::SystemCapabilityType::DISPLAY: { + case mobile_apis::SystemCapabilityType::DISPLAYS: { // Display capabilities content will be populated in the code after the // switch so just breaking here break; @@ -165,7 +165,7 @@ void OnSystemCapabilityUpdatedNotification::Run() { return false; } - if (mobile_apis::SystemCapabilityType::DISPLAY == + if (mobile_apis::SystemCapabilityType::DISPLAYS == system_capability_type && initial_connection_key > 0) { LOG4CXX_DEBUG(logger_, @@ -205,7 +205,7 @@ void OnSystemCapabilityUpdatedNotification::Run() { continue; } - if (mobile_apis::SystemCapabilityType::DISPLAY == system_capability_type) { + if (mobile_apis::SystemCapabilityType::DISPLAYS == system_capability_type) { LOG4CXX_DEBUG(logger_, "Using common display capabilities"); auto capabilities = hmi_capabilities_.system_display_capabilities(); if (app->is_resuming()) { diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc index 4cc197d766..4b964a4480 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc @@ -75,8 +75,8 @@ void SDLRPCPlugin::OnApplicationEvent( application->AddExtension(sys_cap_ext_ptr); // Processing automatic subscription to SystemCapabilities for DISPLAY type const auto capability_type = - mobile_apis::SystemCapabilityType::eType::DISPLAY; - LOG4CXX_DEBUG(logger_, "Subscription to DISPLAY capability is enabled"); + mobile_apis::SystemCapabilityType::eType::DISPLAYS; + LOG4CXX_DEBUG(logger_, "Subscription to DISPLAYS capability is enabled"); sys_cap_ext_ptr->SubscribeTo(capability_type); } else if (plugins::ApplicationEvent::kDeleteApplicationData == event) { ClearSubscriptions(application); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc index 1be3780eca..f3ed480180 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc @@ -97,7 +97,7 @@ TEST_F( Run_AppIdNotPresentedInMessage_SetSystemDisplayCapabilitiesToHMICapabilities_SendMessageToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; EXPECT_CALL(mock_hmi_capabilities_, set_system_display_capabilities( @@ -117,7 +117,7 @@ TEST_F(OnBCSystemCapabilityUpdatedNotificationFromHMITest, Run_AppNotRegisteredWithPresentedAppIdInMessage_MessageNotSendToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; (*message_)[strings::msg_params][strings::app_id] = kAppId; ApplicationSharedPtr app; // Empty application shared pointer @@ -133,7 +133,7 @@ TEST_F( Run_AppRegisteredWithPresentedAppIdInMessage_SetDisplayCapabilitiesToApp_SendMessageToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; (*message_)[strings::msg_params][strings::app_id] = kAppId; ON_CALL(app_mngr_, application(kAppId)).WillByDefault(Return(mock_app_)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc index f2073dcfc0..29f4d02436 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc @@ -79,7 +79,7 @@ TEST_F(OnBCSystemCapabilityUpdatedNotificationTest, SystemDisplayCapabilities_SUCCESS) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; smart_objects::SmartObject system_display_capabilities; @@ -99,7 +99,7 @@ TEST_F(OnBCSystemCapabilityUpdatedNotificationTest, SystemDisplayCapabilities_DATA_NOT_AVAILABLE) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; EXPECT_CALL(mock_hmi_capabilities_, system_display_capabilities()) .WillOnce(Return(nullptr)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc index 2db4d451b1..90797bb1d5 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc @@ -77,7 +77,7 @@ TEST_F( GetSystemCapabilityRequestTest, Run_GetSystemDisplayCapabilities_SendMessageToMobileWithSUCCESSResultCode) { (*message_)[strings::msg_params][strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; smart_objects::SmartObjectSPtr system_display_capabilities( std::make_shared<smart_objects::SmartObject>()); @@ -98,7 +98,7 @@ TEST_F( GetSystemCapabilityRequestTest, Run_GetSystemDisplayCapabilities_CapabilitiesNotExistSendMessageToMobileWithDATA_NOT_AVAILABLEResultCode) { (*message_)[strings::msg_params][strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; EXPECT_CALL(*mock_app_, display_capabilities()).WillOnce(Return(nullptr)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc index 37cbe701a3..a7324f14c9 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc @@ -84,7 +84,7 @@ TEST_F( Run_AppExistSubscribedToNotification_SystemDisplayCapabilitiesSendToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; smart_objects::SmartObject system_display_capabilities; @@ -98,7 +98,7 @@ TEST_F( std::make_shared<sdl_rpc_plugin::SystemCapabilityAppExtension>( sdl_rpc_plugin, *mock_app_)); system_capability_app_extension->SubscribeTo( - mobile_apis::SystemCapabilityType::DISPLAY); + mobile_apis::SystemCapabilityType::DISPLAYS); application_manager::ApplicationSet apps({mock_app_}); std::shared_ptr<sync_primitives::Lock> apps_lock_( std::make_shared<sync_primitives::Lock>()); @@ -130,7 +130,7 @@ TEST_F( Run_AppExistConnectionKeyNotEqualWithAppId_SystemDisplayCapabilitiesNotSendToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; smart_objects::SmartObject system_display_capabilities; @@ -144,7 +144,7 @@ TEST_F( std::make_shared<sdl_rpc_plugin::SystemCapabilityAppExtension>( sdl_rpc_plugin, *mock_app_)); system_capability_app_extension->SubscribeTo( - mobile_apis::SystemCapabilityType::DISPLAY); + mobile_apis::SystemCapabilityType::DISPLAYS); application_manager::ApplicationSet apps({mock_app_}); std::shared_ptr<sync_primitives::Lock> apps_lock_( std::make_shared<sync_primitives::Lock>()); @@ -170,7 +170,7 @@ TEST_F( Run_AppExistNotSubscribedToNotification_SystemDisplayCapabilitiesNotSendToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; smart_objects::SmartObject system_display_capabilities; @@ -209,7 +209,7 @@ TEST_F( Run_AppDataEmpty_SystemDisplayCapabilitiesUpdatedNotificationNotSendToMobile) { (*message_)[am::strings::msg_params][strings::system_capability] [am::strings::system_capability_type] = - mobile_apis::SystemCapabilityType::DISPLAY; + mobile_apis::SystemCapabilityType::DISPLAYS; application_manager::ApplicationSet apps; std::shared_ptr<sync_primitives::Lock> apps_lock_( std::make_shared<sync_primitives::Lock>()); diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc index d3896115ee..adafc47e15 100644 --- a/src/components/application_manager/src/message_helper/message_helper.cc +++ b/src/components/application_manager/src/message_helper/message_helper.cc @@ -376,7 +376,7 @@ MessageHelper::CreateDisplayCapabilityUpdateToMobile( smart_objects::SmartObject system_capability(smart_objects::SmartType_Map); system_capability[strings::system_capability_type] = - static_cast<int32_t>(mobile_apis::SystemCapabilityType::DISPLAY); + static_cast<int32_t>(mobile_apis::SystemCapabilityType::DISPLAYS); system_capability[strings::display_capabilities] = display_capabilities; (*message)[strings::msg_params][strings::system_capability] = system_capability; diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index 30569c0d36..15cd5facb9 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -3957,7 +3957,7 @@ <element name="VIDEO_STREAMING"/> <element name="REMOTE_CONTROL"/> <element name="APP_SERVICES" /> - <element name="DISPLAY"/> + <element name="DISPLAYS"/> </enum> <struct name="SystemCapability"> diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index 8cdfa102f1..51cb565881 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -2969,7 +2969,7 @@ <element name="VIDEO_STREAMING"/> <element name="REMOTE_CONTROL"/> <element name="APP_SERVICES" since="5.1"/> - <element name="DISPLAY" since="6.0"/> + <element name="DISPLAYS" since="6.0"/> </enum> <struct name="NavigationCapability" since="4.5"> @@ -4474,7 +4474,7 @@ <param name="displayCapabilities" type="DisplayCapabilities" mandatory="false" deprecated="true" since="6.0"> <description> - See DisplayCapabilities. This parameter is deprecated and replaced by SystemCapability using DISPLAY. + See DisplayCapabilities. This parameter is deprecated and replaced by SystemCapability using DISPLAYS. </description> <history> <param name="displayCapabilities" type="DisplayCapabilities" mandatory="false" since="2.0" until="6.0"/> @@ -4483,7 +4483,7 @@ <param name="buttonCapabilities" type="ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false" deprecated="true" since="6.0"> <description> - See ButtonCapabilities. This parameter is deprecated and replaced by SystemCapability using DISPLAY. + See ButtonCapabilities. This parameter is deprecated and replaced by SystemCapability using DISPLAYS. </description> <history> <param name="buttonCapabilities" type="ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false" since="2.0" until="6.0"/> @@ -4493,7 +4493,7 @@ <param name="softButtonCapabilities" type="SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false" deprecated="true" since="6.0"> <description> If returned, the platform supports on-screen SoftButtons; see SoftButtonCapabilities. - This parameter is deprecated and replaced by SystemCapability using DISPLAY. + This parameter is deprecated and replaced by SystemCapability using DISPLAYS. </description> <history> <param name="softButtonCapabilities" type="SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false" since="2.0" until="6.0"/> @@ -4503,7 +4503,7 @@ <param name="presetBankCapabilities" type="PresetBankCapabilities" mandatory="false" deprecated="true" since="6.0"> <description> If returned, the platform supports custom on-screen Presets; see PresetBankCapabilities. - This parameter is deprecated and replaced by SystemCapability using DISPLAY. + This parameter is deprecated and replaced by SystemCapability using DISPLAYS. </description> <history> <param name="presetBankCapabilities" type="PresetBankCapabilities" mandatory="false" since="2.0" until="6.0"/> |