APPLINK-6698. Usage of pre_DataConsent if no device consent added.

diff --git a/src/appMain/log4cxx.properties b/src/appMain/log4cxx.properties
index 5301ba3..5a3c37c 100644 (file)
--- a/src/appMain/log4cxx.properties
+++ b/src/appMain/log4cxx.properties
@@ -47,7 +47,7 @@ log4j.appender.HmiFrameworkPluginLogFile.layout=org.apache.log4j.PatternLayout
 log4j.appender.HmiFrameworkPluginLogFile.layout.ConversionPattern=%-5p [%d{dd MMM yyyy HH:mm:ss,SSS}][%c] %F:%L %M: %m%n
 
 # All SmartDeviceLinkCore logs
-log4j.rootLogger=ALL, SmartDeviceLinkCoreLogFile, SmartDeviceLinkCoreSocketHub
+log4j.rootLogger=ALL, Console, SmartDeviceLinkCoreLogFile, SmartDeviceLinkCoreSocketHub
 
 # TransportManager logs
 log4j.logger.TransportManager=ALL, TransportManagerLogFile

diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index 53d811c..b282bde 100644 (file)
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -32,6 +32,119 @@
       }\r
     },\r
     "functional_groupings": {\r
+       "pre_Base-1": {\r
+                   "rpcs": {\r
+                     "ChangeRegistration": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "DeleteFile": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "GenericResponse": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED"\r
+                       ]\r
+                     },\r
+                     "ListFiles": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "OnAppInterfaceUnregistered": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "OnLanguageChange": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "OnPermissionsChange": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "PutFile": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "RegisterAppInterface": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "ResetGlobalProperties": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED"\r
+                       ]\r
+                     },\r
+                     "SetAppIcon": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "SetDisplayLayout": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     },\r
+                     "SetGlobalProperties": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED"\r
+                       ]\r
+                     },\r
+                     "UnregisterAppInterface": {\r
+                       "hmi_levels": [\r
+                         "BACKGROUND",\r
+                         "FULL",\r
+                         "LIMITED",\r
+                         "NONE"\r
+                       ]\r
+                     }\r
+                   }\r
+               },\r
       "Base-4": {\r
         "rpcs": {\r
          "OnSystemRequest": {\r
@@ -1900,7 +2013,7 @@
         "memory_kb": 300,\r
         "watchdog_timer_ms": 1000,\r
         "groups": [\r
-          "DataConsent-2"\r
+          "pre_Base-1"\r
         ]\r
       }\r
     }\r

diff --git a/src/components/policy b/src/components/policy
index 3ed2d58..0c66cfc 160000 (submodule)
--- a/src/components/policy
+++ b/src/components/policy
@@ -1 +1 @@
-Subproject commit 3ed2d5854422257605016c1f9825567ad105f376
+Subproject commit 0c66cfcf498a3cbb17c6e16c83e20f947eea8a27