diff options
| author | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-02-26 14:25:05 -0500 |
|---|---|---|
| committer | Shobhit Adlakha <adlakhashobhit@gmail.com> | 2019-02-26 14:25:05 -0500 |
| commit | 2cb0d5758bbc733770b08e1495f03f64205064ea (patch) | |
| tree | 92e0d38f9ceeeab6be4b6346b408e6109559a745 /src/appMain | |
| parent | 8a442f27a9e408cb9071559757a029bd59a6a58a (diff) | |
| parent | 45b9c2e8d109ed124c604c4b690b1847bc93c9c6 (diff) | |
| download | sdl_core-2cb0d5758bbc733770b08e1495f03f64205064ea.tar.gz | |
Merge branch 'feature/base_app_services_implementation' into feature/forwarded_request_timeout
Diffstat (limited to 'src/appMain')
| -rw-r--r-- | src/appMain/sdl_preloaded_pt.json | 20 | ||||
| -rw-r--r-- | src/appMain/smartDeviceLink.ini | 7 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json index 06ab56bc39..8041a0d4e9 100644 --- a/src/appMain/sdl_preloaded_pt.json +++ b/src/appMain/sdl_preloaded_pt.json @@ -180,6 +180,12 @@ "LIMITED",
"NONE"]
},
+ "OnSystemCapabilityUpdated": {
+ "hmi_levels": ["BACKGROUND",
+ "FULL",
+ "LIMITED",
+ "NONE"]
+ },
"PerformAudioPassThru": {
"hmi_levels": ["FULL",
"LIMITED"]
@@ -577,10 +583,20 @@ "AppService":{
"rpcs":{
"PublishAppService":{
- "hmi_levels":["BACKGROUND",
+ "hmi_levels": [
+ "BACKGROUND",
"FULL",
"LIMITED",
- "NONE"]
+ "NONE"
+ ]
+ },
+ "PerformAppServiceInteraction": {
+ "hmi_levels": [
+ "BACKGROUND",
+ "FULL",
+ "LIMITED",
+ "NONE"
+ ]
}
}
},
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index 50e27452c0..ee67e6f018 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -379,3 +379,10 @@ RpcPassThroughTimeout = 10000 ; Note: this configuration is applied even if multiple-transports feature is not enabled. ;AudioServiceTransports = TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, IAP_USB, AOA_USB ;VideoServiceTransports = TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, IAP_USB, AOA_USB + +[AppServices] +; The ID used to fill the originApp field when the HMI sends a PerformAppServiceInteraction request +HMIOriginID = "HMI_ID" + +; 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 |