Merge pull request #3100 from smartdevicelink/release/6.0.0

Release 6.0.0
smartdevicelink · Oct 30, 2019 · 891497b · 891497b
2 parents ea59602 + 4d283e6
commit 891497b
Show file tree

Hide file tree

Showing 1,726 changed files with 53,431 additions and 20,544 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ addons:
 before_install:
   - sudo apt-get update
   - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck
-  - sudo apt-get install -f clang-format-3.6
+  - sudo apt-get install -f clang-format-6.0
 
 script:
   - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --quiet --error-exitcode=1 src

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -237,7 +237,7 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
 set(ARCHIVE_OUTPUT_DIRECTORY ./bin)
 
 set(EXCLUDE_ERROR_FLAGS "-Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations")
-set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
+set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -fvisibility=hidden -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
 
 if (USE_GOLD_LD)
   execute_process(COMMAND ld -v OUTPUT_VARIABLE result)
@@ -343,7 +343,9 @@ endif()
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
     add_definitions(-DEXTERNAL_PROPRIETARY_MODE)
     set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/)
-    set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/)
+    set(POLICY_GLOBAL_INCLUDE_PATH
+      ${COMPONENTS_DIR}/include/policy/policy_external/
+      ${CMAKE_BINARY_DIR}/src/components/policy/policy_external/)
     set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/)
     message(STATUS "EXTERNAL_PROPRIETARY policy enabled")
 else()
@@ -354,7 +356,9 @@ else()
      message(STATUS "HTTP policy enabled")
    endif()
    set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_regular/)
-   set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_regular/)
+   set(POLICY_GLOBAL_INCLUDE_PATH
+    ${COMPONENTS_DIR}/include/policy/policy_regular/
+    ${CMAKE_BINARY_DIR}/src/components/policy/policy_regular/)
    set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_regular/)
 endif()
 

diff --git a/Doxyfile b/Doxyfile
@@ -899,7 +899,8 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = \
-                         src/components/security_manager/docs/assets
+                         src/components/security_manager/docs/assets \
+                         src/components/protocol_handler/docs/assets
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program

diff --git a/README.md b/README.md
@@ -97,6 +97,7 @@ There are several RPCs that are "required" to be implemented in order for SDL to
   * DeleteCommand
   * AddSubMenu
   * DeleteSubMenu
+  * ShowAppMenu
   * CreateInteractionChoiceSet
   * PerformInteraction
   * DeleteInteractionChoiceSet

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
@@ -242,13 +242,24 @@
                         "resolutionWidth": 35,
                         "resolutionHeight": 35
                     }
+                },
+                {
+                    "name": "alertIcon",
+                    "imageTypeSupported": [
+                        "GRAPHIC_PNG"
+                    ],
+                    "imageResolution": {
+                        "resolutionWidth": 225,
+                        "resolutionHeight": 225
+                    }
                 }
 
             ],
             "mediaClockFormats": [
                 "CLOCK1", "CLOCK2", "CLOCK3", "CLOCKTEXT1", "CLOCKTEXT2", "CLOCKTEXT3", "CLOCKTEXT4"
             ],
             "graphicSupported": true,
+            "menuLayoutsAvailable": [ "LIST", "TILES" ],
             "templatesAvailable": [
                 "DEFAULT", "MEDIA", "NON-MEDIA", "ONSCREEN_PRESETS", "NAV_FULLSCREEN_MAP", "NAV_KEYBOARD",
                 "GRAPHIC_WITH_TEXT", "TEXT_WITH_GRAPHIC", "TILES_ONLY", "TEXTBUTTONS_ONLY",
@@ -274,11 +285,11 @@
                 "STATIC"
             ]
         },
-        "audioPassThruCapabilities": {
+        "audioPassThruCapabilities": [{
             "samplingRate": "44KHZ",
             "bitsPerSample": "RATE_8_BIT",
             "audioType": "PCM"
-        },
+        }],
         "pcmStreamCapabilities": {
             "samplingRate": "16KHZ",
             "bitsPerSample": "RATE_16_BIT",
@@ -309,125 +320,220 @@
                     "protocol": "RAW",
                     "codec": "H264"
                 }],
-                "hapticSpatialDataSupported": false
+                "hapticSpatialDataSupported": false,
+                "diagonalScreenSize": 8,
+                "pixelPerInch": 117,
+                "scale": 1
+            },
+            "seatLocationCapability": {
+                "rows": 2,
+                "columns": 3,
+                "levels": 1,
+                "seats": [
+                    {
+                        "row": 0,
+                        "col": 0,
+                        "level": 0,
+                        "rowspan": 1,
+                        "levelspan": 1,
+                        "colspan": 1
+                    }
+                ]
             },
             "remoteControlCapability": {
                 "buttonCapabilities": [
                     {
                         "longPressAvailable": true,
                         "name": "AC_MAX",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "AC",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "RECIRCULATE",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "FAN_UP",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "FAN_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "TEMP_UP",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "TEMP_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST_MAX",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST_REAR",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "UPPER_VENT",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "LOWER_VENT",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "VOLUME_UP",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "VOLUME_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "EJECT",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "SOURCE",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "SHUFFLE",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "REPEAT",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     }
                 ],
                 "climateControlCapabilities": [
                     {
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "acEnableAvailable": true,
                         "acMaxEnableAvailable": true,
                         "autoModeEnableAvailable": true,
                         "circulateAirEnableAvailable": true,
+                        "climateEnableAvailable": true,
                         "currentTemperatureAvailable": true,
                         "defrostZone": [
                             "FRONT",
@@ -455,7 +561,11 @@
                 ],
                 "radioControlCapabilities": [
                     {
-                        "availableHDsAvailable": true,
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": true
+                        },
+                        "availableHdChannelsAvailable": true,
                         "hdChannelAvailable": true,
                         "moduleName": "radio",
                         "radioBandAvailable": true,
@@ -473,6 +583,10 @@
                 "audioControlCapabilities": [
                     {
                         "moduleName": "audio",
+                        "moduleInfo": {
+                            "moduleId": "a279fe12-4587-4d12-8514-50f4ea9e9537",
+                            "allowMultipleAccess": true
+                        },
                         "sourceAvailable": true,
                         "volumeAvailable": true,
                         "equalizerAvailable": true,
@@ -483,6 +597,10 @@
                 "seatControlCapabilities": [
                     {
                         "moduleName": "driver_seat",
+                        "moduleInfo": {
+                            "moduleId": "06cdec22-920e-4865-bf2e-9518463edc68",
+                            "allowMultipleAccess": false
+                        },
                         "heatingEnabledAvailable" : true,
                         "coolingEnabledAvailable": true,
                         "heatingLevelAvailable": true,
@@ -502,6 +620,10 @@
                 ],
                 "lightControlCapabilities": {
                         "moduleName": "light",
+                        "moduleInfo": {
+                            "moduleId": "8d73e369-6a1f-4459-ab5a-6e432631881d",
+                            "allowMultipleAccess": false
+                        },
                         "supportedLights":[
                               {
                                  "statusAvailable":true,
@@ -795,6 +917,10 @@
                 },
                 "hmiSettingsControlCapabilities": {
                         "moduleName": "hmiSettings",
+                        "moduleInfo": {
+                            "moduleId": "c8cace3c-d482-4be1-8862-624a21e34563",
+                            "allowMultipleAccess": true
+                        },
                         "distanceUnitAvailable": true,
                         "temperatureUnitAvailable": true,
                         "displayModeUnitAvailable": true