summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Kutsan <akutsan@luxoft.com>2018-03-23 23:07:48 +0200
committerAlex Kutsan <akutsan@luxoft.com>2018-03-29 01:12:03 +0300
commitd2c6884fccf06594d1be42bc7f1d4484b3aa0e55 (patch)
tree073506b27e9c44e4d81064d9c7a0a2c02c294a52
parente21215ae0260025b3c420487a61e44755d5ed3cc (diff)
downloadsdl_core-d2c6884fccf06594d1be42bc7f1d4484b3aa0e55.tar.gz
Avoid adding RC groups in external policy flow
fixup! Avoid adding RC groups in external policy flow
-rw-r--r--src/components/policy/policy_external/src/policy_manager_impl.cc13
1 files changed, 1 insertions, 12 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 180b0406a1..564912d237 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -588,13 +588,8 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id,
policy_table::FunctionalGroupings functional_groupings;
cache_->GetFunctionalGroupings(functional_groupings);
-#ifdef SDL_REMOTE_CONTROL
- ApplicationOnDevice who = {device_id, app_id};
- const policy_table::Strings app_groups = access_remote_->GetGroups(who);
-#else // SDL_REMOTE_CONTROL
- const policy_table::Strings app_groups =
+ policy_table::Strings app_groups =
GetGroupsNames(app_group_permissions);
-#endif // SDL_REMOTE_CONTROL
// Undefined groups (without user consent) disallowed by default, since
// OnPermissionsChange notification has no "undefined" section
@@ -1160,14 +1155,8 @@ void PolicyManagerImpl::GetPermissionsForApp(
FunctionalIdType group_types;
-#ifdef SDL_REMOTE_CONTROL
- allowed_by_default = false;
- const bool ret = access_remote_->GetPermissionsForApp(
- device_id, app_id_to_check, group_types);
-#else
const bool ret =
cache_->GetPermissionsForApp(device_id, app_id_to_check, group_types);
-#endif // REMOTE_CONTROL
if (!ret) {
LOG4CXX_WARN(logger_,