diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-10-02 18:43:40 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-10-03 09:38:31 -0400 |
| commit | b3e1c2c8e55064af494170fc5f8741bcaa69d426 (patch) | |
| tree | 98cda2eb6487585872e7e44c735e294432d62e02 | |
| parent | 7ed7e819828a1957b0f4b27e4f13ff99ed81c230 (diff) | |
| parent | df2f42ce8eb2c22671b7bd34077e95b0be62bc33 (diff) | |
| download | sdl_core-b3e1c2c8e55064af494170fc5f8741bcaa69d426.tar.gz | |
Merge branch 'fix/allow_user_consent_for_default_groups' of https://github.com/JackLivio/sdl_core into fix/allow_user_consent_for_default_groups
| -rw-r--r-- | src/components/policy/policy_external/src/policy_helper.cc | 4 | ||||
| -rw-r--r-- | src/components/policy/policy_external/src/policy_manager_impl.cc | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc index 4d4b62470c..bd83f24a92 100644 --- a/src/components/policy/policy_external/src/policy_helper.cc +++ b/src/components/policy/policy_external/src/policy_helper.cc @@ -302,7 +302,9 @@ void CheckAppPolicy::AddResult(const std::string& app_id, void CheckAppPolicy::InsertPermission(const std::string& app_id, const AppPermissions& permissions_diff) { pm_->app_permissions_diff_lock_.Acquire(); - if (!pm_->app_permissions_diff_.insert(std::make_pair(app_id, permissions_diff)).second) { + auto result = pm_->app_permissions_diff_.insert( + std::make_pair(app_id, permissions_diff)); + if (!result.second) { LOG4CXX_ERROR(logger_, "App ID: " << app_id << " already exists in map."); } pm_->app_permissions_diff_lock_.Release(); diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc index d624f7edc8..3f4d20bb89 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -1246,10 +1246,6 @@ void PolicyManagerImpl::GetUserConsentForApp( FunctionalGroupIDs preconsented_groups = group_types[kTypePreconsented]; FunctionalGroupIDs consent_allowed_groups = group_types[kTypeAllowed]; FunctionalGroupIDs consent_disallowed_groups = group_types[kTypeDisallowed]; - FunctionalGroupIDs default_groups = group_types[kTypeDefault]; - FunctionalGroupIDs predataconsented_groups = - group_types[kTypePreDataConsented]; - FunctionalGroupIDs device_groups = group_types[kTypeDevice]; // Sorting groups by consent FunctionalGroupIDs preconsented_wo_auto = |