diff options
3 files changed, 25 insertions, 30 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 95267b79fc..8d10511d66 100644 --- a/src/components/application_manager/include/application_manager/message_helper.h +++ b/src/components/application_manager/include/application_manager/message_helper.h @@ -370,9 +370,7 @@ class MessageHelper { #ifdef EXTERNAL_PROPRIETARY_MODE static void SendGetListOfPermissionsResponse( const std::vector<policy::FunctionalGroupPermission>& permissions, -#if EXTERNAL_PROPRIETARY_MODE const policy::ExternalConsentStatus& external_consent_status, -#endif // EXTERNAL_PROPRIETARY_MODE const uint32_t correlation_id, ApplicationManager& app_mngr); #else diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index 2929a1afaf..0d6d5fad3d 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -1241,17 +1241,16 @@ </struct> <struct name="PermissionItem"> - <param name="name" type="String" mandatory="true"> - <description>Code of message of user-friendly text about functional group to be allowed/disallowed</description> - </param> - <param name="id" type="Integer" mandatory="true"> - <description>Id of corresponding functional group, needed by SDL.</description> - </param> - <param name="allowed" type="Boolean" mandatory="false"> - <description>Specifies whether functionality was allowed/disallowed. If ommited - no information about User Consent is yet found for app.</description> - </param> - </struct> - + <param name="name" type="String" mandatory="true"> + <description>Code of message of user-friendly text about functional group to be allowed/disallowed</description> + </param> + <param name="id" type="Integer" mandatory="true"> + <description>Id of corresponding functional group, needed by SDL.</description> + </param> + <param name="allowed" type="Boolean" mandatory="false"> + <description>Specifies whether functionality was allowed/disallowed. If ommited - no information about User Consent is yet found for app.</description> + </param> + </struct> <struct name="ServiceInfo"> <param name="url" type="String" mandatory="true"> <description>Get URL based on service type.</description> @@ -1262,22 +1261,20 @@ </struct> <enum name="EntityStatus"> - <element name="ON"/> - <element name="OFF"/> + <element name="ON"/> + <element name="OFF"/> </enum> <struct name="ExternalConsentStatus"> - <param name="entityType" type="Integer" minvalue="0" maxvalue="128" mandatory="true"> - <description>The entityType which status is informed by "status" param.</description> - </param> - - <param name="entityID" type="Integer" minvalue="0" maxvalue="128" mandatory="true"> - <description>The corresponding ID of entityType which status is informed by "status" param</description> - </param> - - <param name="status" type="Common.EntityStatus" mandatory="true"> - <description>Status of the ExternalConsentStatus entity: "ON" or "OFF". </description> - </param> + <param name="entityType" type="Integer" minvalue="0" maxvalue="128" mandatory="true"> + <description>The entityType which status is informed by "status" param.</description> + </param> + <param name="entityID" type="Integer" minvalue="0" maxvalue="128" mandatory="true"> + <description>The corresponding ID of entityType which status is informed by "status" param</description> + </param> + <param name="status" type="Common.EntityStatus" mandatory="true"> + <description>Status of the ExternalConsentStatus entity: "ON" or "OFF". </description> + </param> </struct> <!-- End of Policies --> @@ -4170,7 +4167,7 @@ <param name="allowedFunctions" type="Common.PermissionItem" mandatory="true" array="true" minsize="0" maxsize="100"> <description>If no permissions were specified for application the array will come empty.</description> </param> - <param name="externalConsentStatus" type="Common.ExternalConsentStatus" mandatory="true" array="true" minsize="0" maxsize="100"> + <param name="externalConsentStatus" type="Common.ExternalConsentStatus" mandatory="true" array="true" minsize="0" maxsize="100"> <description>External User Consent Settings (defined by entityType and entityID) status: enabled/disabled. If empty array is returned, SDL does not have any stored status.</description> </param> </function> @@ -4178,14 +4175,14 @@ <function name="OnAppPermissionConsent" messagetype="notification"> <description>Initiated by HMI for specifying the allowance for the application to perform some functionality. Duplicates functionality of the request, needed if HMI has specific ways to allow/disallow functionality (i.e.Setting Menu)</description> <param name="appID" type="Integer" mandatory="false"> - <description>Information about the application. See HMIApplication. If omitted - allow/disallow all applications </description> + <description>Information about the application. See HMIApplication. If omitted - allow/disallow all applications </description> </param> <param name="consentedFunctions" type="Common.PermissionItem" mandatory="false" array="true" minsize="1" maxsize="100"/> <param name="externalConsentStatus" type="Common.ExternalConsentStatus" mandatory="false" array="true" minsize="1" maxsize="100"/> <param name="source" type="Common.ConsentSource" mandatory="true"/> </function> - <function name="OnAppPermissionChanged" messagetype="notification"> + <function name="OnAppPermissionChanged" messagetype="notification"> <description>Notification from SDL to HMI. Occurs when app permissions were reduced. If no permission specified means that app was dissallowed and has to be unregitstered.</description> <param name="appID" type="Integer" mandatory="true"/> <param name="isAppPermissionsRevoked" type="Boolean" mandatory="false"/> diff --git a/src/components/policy/policy_regular/src/policy_table/types.cc b/src/components/policy/policy_regular/src/policy_table/types.cc index 23813d0488..7928973919 100644 --- a/src/components/policy/policy_regular/src/policy_table/types.cc +++ b/src/components/policy/policy_regular/src/policy_table/types.cc @@ -172,7 +172,7 @@ Json::Value ApplicationParams::ToJsonValue() const { Json::Value result__(PolicyBase::ToJsonValue()); impl::WriteJsonField("groups", groups, &result__); impl::WriteJsonField("nicknames", nicknames, &result__); - impl::WriteJsonField("AppHmiType", AppHMIType, &result__); + impl::WriteJsonField("AppHMIType", AppHMIType, &result__); impl::WriteJsonField("RequestType", RequestType, &result__); impl::WriteJsonField("memory_kb", memory_kb, &result__); impl::WriteJsonField( |