diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-04-06 09:54:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 09:54:02 -0400 |
| commit | 790fd10e4a392d8d452f35f69e5e4e0a39b30b44 (patch) | |
| tree | 5e5742aba29dd96ee5d5724886c47c5b24536d73 | |
| parent | 3ba8a85c7fa6b9f7d2c9dca3e102168b3df6a00a (diff) | |
| parent | bdc1036bf8f28cae61e4ff676dc0a82a09d2f28b (diff) | |
| download | sdl_core-790fd10e4a392d8d452f35f69e5e4e0a39b30b44.tar.gz | |
Merge pull request #2118 from vkushnirenko-luxoft/fix/style_fix
Fix style after 4.5 merge
| -rw-r--r-- | src/components/policy/policy_external/src/policy_manager_impl.cc | 11 |
1 files changed, 5 insertions, 6 deletions
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 2cd0d2b23b..122efa2435 100644 --- a/src/components/policy/policy_external/src/policy_manager_impl.cc +++ b/src/components/policy/policy_external/src/policy_manager_impl.cc @@ -588,8 +588,7 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id, policy_table::FunctionalGroupings functional_groupings; cache_->GetFunctionalGroupings(functional_groupings); - policy_table::Strings app_groups = - GetGroupsNames(app_group_permissions); + policy_table::Strings app_groups = GetGroupsNames(app_group_permissions); // Undefined groups (without user consent) disallowed by default, since // OnPermissionsChange notification has no "undefined" section @@ -621,8 +620,7 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id, } const bool known_rpc = rpc_permissions.end() != rpc_permissions.find(rpc); - LOG4CXX_DEBUG(logger_, "Is known rpc " << - (known_rpc ? "true" : "false") ); + LOG4CXX_DEBUG(logger_, "Is known rpc " << (known_rpc ? "true" : "false")); if (!known_rpc) { // RPC not found in list == disallowed by backend result.hmi_level_permitted = kRpcDisallowed; @@ -644,7 +642,9 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id, rpc_permissions[rpc].hmi_permissions[kUserDisallowedKey].find( hmi_level)) { // RPC found in allowed == allowed by backend, but disallowed by user - LOG4CXX_DEBUG(logger_, "RPC found in allowed == allowed by backend, but disallowed by user"); + LOG4CXX_DEBUG( + logger_, + "RPC found in allowed == allowed by backend, but disallowed by user"); result.hmi_level_permitted = kRpcUserDisallowed; } else { LOG4CXX_DEBUG(logger_, @@ -984,7 +984,6 @@ void PolicyManagerImpl::SetUserConsentForApp( const PermissionConsent& permissions, const NotificationMode mode) { LOG4CXX_AUTO_TRACE(logger_); - cache_->ResetCalculatedPermissions(); PermissionConsent verified_permissions = EnsureCorrectPermissionConsent(permissions); |