diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2019-03-07 23:26:35 -0500 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2019-03-07 23:26:35 -0500 |
| commit | 0fdfd32ff5ebeae5d6eb8f92131b235de5441236 (patch) | |
| tree | 921488f777cfa7bf2d0e15ea3d387e8a74ba98de | |
| parent | 9a60799a4f119e2411ee0a0a9d94ae1c8fa668f8 (diff) | |
| download | sdl_core-feature/base_app_services_implementation.tar.gz | |
Update preloaded PT and fix merge issuesfeature/base_app_services_implementation
3 files changed, 54 insertions, 22 deletions
diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index f70fdfdf10..06b9c3caa4 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -199,12 +199,6 @@ "FULL",
"LIMITED",
"NONE"]
- },
- "GetFile": {
- "hmi_levels": ["BACKGROUND",
- "FULL",
- "LIMITED",
- "NONE"]
},
"RegisterAppInterface": {
"hmi_levels": ["BACKGROUND",
@@ -591,21 +585,73 @@ }
}
},
- "AppService":{
+ "AppServiceProducer":{
"rpcs":{
"PublishAppService":{
"hmi_levels": [
+ "FULL",
+ "LIMITED",
"BACKGROUND",
+ "NONE"
+ ]
+ },
+ "GetAppServiceData": {
+ "hmi_levels": [
"FULL",
"LIMITED",
+ "BACKGROUND",
+ "NONE"
+ ]
+ },
+ "OnAppServiceData": {
+ "hmi_levels": [
+ "FULL",
+ "LIMITED",
+ "BACKGROUND",
"NONE"
]
},
"PerformAppServiceInteraction": {
"hmi_levels": [
+ "FULL",
+ "LIMITED",
"BACKGROUND",
+ "NONE"
+ ]
+ }
+ }
+ },
+ "AppServiceConsumer": {
+ "rpcs": {
+ "GetFile": {
+ "hmi_levels": [
+ "FULL",
+ "LIMITED",
+ "BACKGROUND",
+ "NONE"
+ ]
+ },
+ "GetAppServiceData": {
+ "hmi_levels": [
+ "FULL",
+ "LIMITED",
+ "BACKGROUND",
+ "NONE"
+ ]
+ },
+ "OnAppServiceData": {
+ "hmi_levels": [
"FULL",
"LIMITED",
+ "BACKGROUND",
+ "NONE"
+ ]
+ },
+ "PerformAppServiceInteraction": {
+ "hmi_levels": [
+ "FULL",
+ "LIMITED",
+ "BACKGROUND",
"NONE"
]
}
@@ -2451,7 +2497,7 @@ "steal_focus": false,
"priority": "NONE",
"default_hmi": "NONE",
- "groups": ["Base-4", "AppService"],
+ "groups": ["Base-4"],
"RequestType": [],
"RequestSubType": []
},
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index 2b2c784746..54c2395c47 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -359,16 +359,6 @@ EnableAppLaunchIOS = true ;SecondaryTransportForUSB = ;SecondaryTransportForWiFi = -[AppServices] -; The ID to pass to app service publishers when sending a PerformAppServiceInteraction request -;CoresOriginId = "sdl_core" - -; Services that exist on the module. Values are of AppServiceType in RPC Spec. These services will be used as default and app services will only become primary service publisher with direct user interaction. These services will also be a fallback if no app service publisher is registered with the system of that type. -;EmbeddedServices = MEDIA, WEATHER, NAVIGATION, VOICE_ASSISTANT, COMMUNICATION_VOIP, MESSAGING, TTS - -; Additional time added to RPC timeout when passing through to App service -RpcPassThroughTimeout = 10000 - [ServicesMap] ; A matrix to specify which service is allowed on which transports. The transports are listed ; in preferred order. If a transport is not listed, then the service is not allowed diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc index 572e637108..4b4da5e3e9 100644 --- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc +++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_mobile_command_factory.cc @@ -47,10 +47,6 @@ #include "app_service_rpc_plugin/commands/mobile/perform_app_service_interaction_response_from_mobile.h" #include "app_service_rpc_plugin/commands/mobile/publish_app_service_request.h" #include "app_service_rpc_plugin/commands/mobile/publish_app_service_response.h" -#include "app_service_rpc_plugin/commands/mobile/get_app_service_data_request.h" -#include "app_service_rpc_plugin/commands/mobile/get_app_service_data_response.h" -#include "app_service_rpc_plugin/commands/mobile/get_app_service_data_request_to_mobile.h" -#include "app_service_rpc_plugin/commands/mobile/get_app_service_data_response_from_mobile.h" CREATE_LOGGERPTR_GLOBAL(logger_, "AppServiceRpcPlugin") |