APPLINK-11621. PoliciesManager: Adding support of RequestType field to the policy table and appropriate logic.

3 files changed, 73 insertions, 0 deletions

diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index f6b916788e..59d98c2fce 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -978,6 +978,20 @@
     <element name="AUTH_CHALLENGE" />
     <element name="AUTH_ACK" />
     <element name="PROPRIETARY" />
+  <element name="QUERY_APPS" />
+  <element name="LAUNCH_APP" />
+  <element name="LOCK_SCREEN_ICON_URL" />
+  <element name="TRAFFIC_MESSAGE_CHANNEL" />
+  <element name="DRIVER_PROFILE" />
+  <element name="VOICE_SEARCH" />
+  <element name="NAVIGATION" />
+  <element name="PHONE" />
+  <element name="CLIMATE" />
+  <element name="SETTINGS" />
+  <element name="VEHICLE_DIAGNOSTICS" />
+  <element name="EMERGENCY" />
+  <element name="MEDIA" />
+  <element name="FOTA" />
 </enum>
 
 <enum name="ECallConfirmationStatus">
@@ -1331,6 +1345,13 @@
       <description>Indicates whether application should be dimmed on the screen.</description>
       <description>Applicable only for apps received through QueryApps and still not registered.</description>
     </param>
+    <param name="requestType" type="Common.RequestType" minsize="0" maxsize="100" array="true" mandatory="false">
+      <description>The list of SystemRequest's RequestTypes allowed by policies for the named application</description>
+      <description>(the app's SystemRequest sent with RequestType out of this list will get 'disallowed' response from SDL).</description>
+      <description>If SDL sends an empty array - any RequestType is allowed for this app.</description>
+      <description>If SDL omits this parameter - none RequestType is allowed for this app</description>
+      <description>(either this is a pre-registered app or such is dictated by policies).</description>
+    </param>
 </struct>
 
 <struct name="MenuParams">
@@ -3886,6 +3907,12 @@
       <param name="priority" type="Common.AppPriority" mandatory="false">
         <description>Send to HMI so that it can coordinate order of requests/notifications correspondingly.</description>
       </param>
+      <param name="requestType" type="Common.RequestType" minsize="0" maxsize="100" array="true" mandatory="false">
+        <description>The list of SystemRequest's RequestTypes allowed by policies for the named application (the app's SystemRequest sent with RequestType           out of this list will get 'disallowed' response from SDL).
+        If SDL sends an empty array - any RequestType is allowed for this app.
+        If SDL omits this parameter - nothing is changed for RequestType in the policies
+      </description>
+      </param>
     </function>
 
   <function name="OnSDLConsentNeeded" messagetype="notification">
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 9106ef2f00..e3a7bd7058 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -2119,6 +2119,18 @@
     <element name="PROPRIETARY" />
     <element name="QUERY_APPS" />
     <element name="LAUNCH_APP" />
+    <element name="LOCK_SCREEN_ICON_URL" />
+    <element name="TRAFFIC_MESSAGE_CHANNEL" />
+    <element name="DRIVER_PROFILE" />
+    <element name="VOICE_SEARCH" />
+    <element name="NAVIGATION" />
+    <element name="PHONE" />
+    <element name="CLIMATE" />
+    <element name="SETTINGS" />
+    <element name="VEHICLE_DIAGNOSTICS" />
+    <element name="EMERGENCY" />
+    <element name="MEDIA" />
+    <element name="FOTA" />
   </enum>
 
   <enum name="AppHMIType">
@@ -4626,6 +4638,13 @@
         <element name="REJECTED"/> 
         <element name="INVALID_CERT"/> 
         <element name="EXPIRED_CERT"/> 
+        <element name="UNSUPPORTED_REQUEST"/>
+        <element name="UNSUPPORTED_RESOURCE"/>
+        <element name="DISALLOWED"/>
+        <element name="ABORTED"/>
+        <element name="WARNINGS"/>
+        <element name="TIMED_OUT"/>
+        <element name="IGNORED"/>
      </param>
   </function> 
 
diff --git a/src/components/interfaces/QT_HMI_API.xml b/src/components/interfaces/QT_HMI_API.xml
index 1960707fb7..a70ba36dfd 100644
--- a/src/components/interfaces/QT_HMI_API.xml
+++ b/src/components/interfaces/QT_HMI_API.xml
@@ -923,6 +923,20 @@
       <element name="AUTH_CHALLENGE"/>
       <element name="AUTH_ACK"/>
       <element name="PROPRIETARY"/>
+      <element name="QUERY_APPS" />
+      <element name="LAUNCH_APP" />
+      <element name="LOCK_SCREEN_ICON_URL" />
+      <element name="TRAFFIC_MESSAGE_CHANNEL" />
+      <element name="DRIVER_PROFILE" />
+      <element name="VOICE_SEARCH" />
+      <element name="NAVIGATION" />
+      <element name="PHONE" />
+      <element name="CLIMATE" />
+      <element name="SETTINGS" />
+      <element name="VEHICLE_DIAGNOSTICS" />
+      <element name="EMERGENCY" />
+      <element name="MEDIA" />
+      <element name="FOTA" />
     </enum>
     <enum name="ECallConfirmationStatus">
       <description>Reflects the status of the eCall Notification.</description>
@@ -1255,6 +1269,13 @@
         <description>Indicates whether application should be dimmed on the screen.</description>
         <description>Applicable only for apps received through QueryApps and still not registered.</description>
       </param>
+      <param name="requestType" type="Common.RequestType" minsize="0" maxsize="100" array="true" mandatory="false">
+        <description>The list of SystemRequest's RequestTypes allowed by policies for the named application</description>
+        <description>(the app's SystemRequest sent with RequestType out of this list will get 'disallowed' response from SDL).</description>
+        <description>If SDL sends an empty array - any RequestType is allowed for this app.</description>
+        <description>If SDL omits this parameter - none RequestType is allowed for this app</description>
+        <description>(either this is a pre-registered app or such is dictated by policies).</description>
+      </param>
     </struct>
     <struct name="MenuParams">
       <param name="parentID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
@@ -4081,6 +4102,12 @@
       <param name="priority" type="Common.AppPriority" mandatory="false">
         <description>Send to HMI so that it can coordinate order of requests/notifications correspondingly.</description>
       </param>
+      <param name="requestType" type="Common.RequestType" minsize="0" maxsize="100" array="true" mandatory="false">
+        <description>The list of SystemRequest's RequestTypes allowed by policies for the named application (the app's SystemRequest sent with RequestType           out of this list will get 'disallowed' response from SDL).
+        If SDL sends an empty array - any RequestType is allowed for this app.
+        If SDL omits this parameter - nothing is changed for RequestType in the policies
+        </description>
+      </param>
     </function>
     <function name="OnSDLConsentNeeded" messagetype="notification" provider="sdl">
       <description>Send from SDL to HMI to notify that data consent is needed for device either because PT update or Retry strategy.</description>