diff options
author | SKobziev <skobziev@luxoft.com> | 2018-10-25 15:20:50 +0300 |
---|---|---|
committer | SKobziev <skobziev@luxoft.com> | 2018-10-26 11:55:24 +0300 |
commit | 072bba71a3b553da369dd8b8e63edf94ab61bff6 (patch) | |
tree | b4a98e0f584df6e1b7b6411bcaa08defd13aa92a /src/components/policy/policy_external/src/sql_pt_ext_representation.cc | |
parent | 0d5b3c4dc01844880f46b752076278578b77781f (diff) | |
parent | d36316738785c96dab2ee892762ed08c059fffde (diff) | |
download | sdl_core-fix/Fix_log_severity_level_in_on_vehicle_data_notification_cc.tar.gz |
Fix log severity level and various typosfix/Fix_log_severity_level_in_on_vehicle_data_notification_cc
There are following minor issues was fixed:
log severity level in on_vehicle_data_notification.cc: ERROR -> DEBUG
typo in on_vehicle_data_notification.cc: nanme -> name
typo in request_controller.cc: HmiConnectoinKey -> HmiConnectionKey
typo in request_info.cc: HmiConnectoinKey -> HmiConnectionKey
Also OnSystemError_SUCCESS was changed to DISABLED_OnSystemError_SUCCESS
in policy_handler_test.cpp because the running this test case was successful
locally and was unsuccess on Jenkins
Diffstat (limited to 'src/components/policy/policy_external/src/sql_pt_ext_representation.cc')
-rw-r--r-- | src/components/policy/policy_external/src/sql_pt_ext_representation.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc index f26264ddf9..a43b22a3b8 100644 --- a/src/components/policy/policy_external/src/sql_pt_ext_representation.cc +++ b/src/components/policy/policy_external/src/sql_pt_ext_representation.cc @@ -874,30 +874,39 @@ bool SQLPTExtRepresentation::GatherApplicationPoliciesSection( *params.memory_kb = query.GetInteger(5); *params.heart_beat_timeout_ms = query.GetUInteger(6); - if (!GatherAppGroup(app_id, ¶ms.groups)) { + const auto& gather_app_id = ((*policies).apps[app_id].is_string()) + ? (*policies).apps[app_id].get_string() + : app_id; + // Data should be gathered from db by "default" key if application has + // default policies + + if (!GatherAppGroup(gather_app_id, ¶ms.groups)) { return false; } bool denied = false; - if (!GatherRemoteControlDenied(app_id, &denied)) { + if (!GatherRemoteControlDenied(gather_app_id, &denied)) { return false; } if (!denied) { - if (!GatherModuleType(app_id, &*params.moduleType)) { + if (!GatherModuleType(gather_app_id, &*params.moduleType)) { return false; } } - if (!GatherNickName(app_id, &*params.nicknames)) { + if (!GatherNickName(gather_app_id, &*params.nicknames)) { + return false; + } + if (!GatherAppType(gather_app_id, &*params.AppHMIType)) { return false; } - if (!GatherAppType(app_id, &*params.AppHMIType)) { + if (!GatherRequestType(gather_app_id, &*params.RequestType)) { return false; } - if (!GatherRequestType(app_id, &*params.RequestType)) { + if (!GatherRequestSubType(gather_app_id, &*params.RequestSubType)) { return false; } - GatherPreconsentedGroup(app_id, &*params.preconsented_groups); + GatherPreconsentedGroup(gather_app_id, &*params.preconsented_groups); (*policies).apps[app_id] = params; } return true; |