Merge pull request #3478 from smartdevicelink/fix/driver_distraction_capability_caching

Cache Driver Distraction Capability

2 files changed, 11 insertions, 0 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
index 9f45d174e7..f966f299c1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
@@ -145,6 +145,7 @@ void UIGetCapabilitiesResponse::Run() {
             strings::driver_distraction_capability)) {
       if (!system_capabilities_so[strings::driver_distraction_capability]
                .empty()) {
+        sections_to_update.push_back(strings::driver_distraction_capability);
         hmi_capabilities_.set_driver_distraction_capability(
             system_capabilities_so[strings::driver_distraction_capability]);
         hmi_capabilities_.set_driver_distraction_supported(true);
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index a529ea3b5d..3e22880222 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -1898,6 +1898,16 @@ void HMICapabilitiesImpl::PrepareUiJsonValueForSaving(
       }
     }
 
+    else if (section_to_update == strings::driver_distraction_capability) {
+      const auto driver_distraction_capability_so =
+          driver_distraction_capability();
+
+      if (driver_distraction_capability_so) {
+        (*system_capabilities)[strings::driver_distraction_capability] =
+            *driver_distraction_capability_so;
+      }
+    }
+
     else if (section_to_update == strings::display_capabilities) {
       const auto display_capabilities_so = display_capabilities();