Merge pull request #3590 from smartdevicelink/fix/vehicle_data_params_omitted

Handle omitted parameter permissions properly in OnVehicleData notification

1 files changed, 16 insertions, 9 deletions

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
index 1799d7068c..ef0f1614af 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
@@ -112,15 +112,22 @@ void OnVehicleDataNotification::Run() {
             mobile_api::FunctionID::OnVehicleDataID),
         appSO[idx].enumerate(),
         &params_permissions);
-
-    for (const auto& param : appSO[idx].enumerate()) {
-      const auto& allowed_params = params_permissions.allowed_params;
-      auto param_allowed = allowed_params.find(param);
-      if (allowed_params.end() == param_allowed) {
-        SDL_LOG_DEBUG("Param " << param << " is not allowed by policy for app "
-                               << notify_apps[idx]->app_id()
-                               << ". It will be ignored.");
-        appSO[idx].erase(param);
+    if (parameters_permissions_.allowed_params.empty() &&
+        parameters_permissions_.disallowed_params.empty() &&
+        parameters_permissions_.undefined_params.empty()) {
+      SDL_LOG_DEBUG(
+          "No parameter permissions provided, all params are allowed");
+    } else {
+      for (const auto& param : appSO[idx].enumerate()) {
+        const auto& allowed_params = params_permissions.allowed_params;
+        auto param_allowed = allowed_params.find(param);
+        if (allowed_params.end() == param_allowed) {
+          SDL_LOG_DEBUG("Param " << param
+                                 << " is not allowed by policy for app "
+                                 << notify_apps[idx]->app_id()
+                                 << ". It will be ignored.");
+          appSO[idx].erase(param);
+        }
       }
     }