1 files changed, 20 insertions, 8 deletions

diff --git a/src/components/policy/policy_regular/src/policy_helper.cc b/src/components/policy/policy_regular/src/policy_helper.cc
index b72a041a83..95f275769c 100644
--- a/src/components/policy/policy_regular/src/policy_helper.cc
+++ b/src/components/policy/policy_regular/src/policy_helper.cc
@@ -267,9 +267,7 @@ void policy::CheckAppPolicy::NotifySystem(
 }
 
 void CheckAppPolicy::SendPermissionsToApp(
-    const AppPoliciesValueType& app_policy) const {
-  const std::string app_id = app_policy.first;
-
+    const std::string& app_id, const policy_table::Strings& groups) const {
   const std::string device_id = pm_->GetCurrentDeviceId(app_id);
   if (device_id.empty()) {
     LOG4CXX_WARN(logger_,
@@ -281,7 +279,7 @@ void CheckAppPolicy::SendPermissionsToApp(
 
   Permissions notification_data;
   pm_->PrepareNotificationData(update_->policy_table.functional_groupings,
-                               app_policy.second.groups,
+                               groups,
                                group_permissons,
                                notification_data);
 
@@ -356,6 +354,20 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
                "Permissions for application:" << app_id
                                               << " have been changed.");
 
+  if (IsPredefinedApp(app_policy)) {
+    for (const policy_table::ApplicationPolicies::value_type& app :
+         snapshot_->policy_table.app_policies_section.apps) {
+      if (app_policy.first == app.second.get_string()) {
+        if (RESULT_CONSENT_NOT_REQIURED != result) {
+          SetPendingPermissions(app, result);
+          NotifySystem(app);
+        }
+        SendPermissionsToApp(app.first, app_policy.second.groups);
+      }
+    }
+    return true;
+  }
+
   if (!IsPredefinedApp(app_policy) && RESULT_CONSENT_NOT_REQIURED != result) {
     SetPendingPermissions(app_policy, result);
     NotifySystem(app_policy);
@@ -363,7 +375,7 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
 
   // Don't sent notification for predefined apps (e.g. default, device etc.)
   if (!IsPredefinedApp(app_policy)) {
-    SendPermissionsToApp(app_policy);
+    SendPermissionsToApp(app_policy.first, app_policy.second.groups);
   }
   return true;
 }
@@ -697,7 +709,7 @@ void FillFunctionalGroupPermissions(
     FunctionalGroupNames& names,
     GroupConsent state,
     std::vector<FunctionalGroupPermission>& permissions) {
-  LOG4CXX_INFO(logger_, "FillFunctionalGroupPermissions");
+  LOG4CXX_AUTO_TRACE(logger_);
   FunctionalGroupIDs::const_iterator it = ids.begin();
   FunctionalGroupIDs::const_iterator it_end = ids.end();
   for (; it != it_end; ++it) {
@@ -717,7 +729,7 @@ bool IsPredefinedApp(const AppPoliciesValueType& app) {
 
 FunctionalGroupIDs ExcludeSame(const FunctionalGroupIDs& from,
                                const FunctionalGroupIDs& what) {
-  LOG4CXX_INFO(logger_, "Exclude same groups");
+  LOG4CXX_AUTO_TRACE(logger_);
   FunctionalGroupIDs from_copy(from);
   FunctionalGroupIDs what_copy(what);
 
@@ -739,7 +751,7 @@ FunctionalGroupIDs ExcludeSame(const FunctionalGroupIDs& from,
 
 FunctionalGroupIDs Merge(const FunctionalGroupIDs& first,
                          const FunctionalGroupIDs& second) {
-  LOG4CXX_INFO(logger_, "Merge groups");
+  LOG4CXX_AUTO_TRACE(logger_);
   FunctionalGroupIDs first_copy(first);
   FunctionalGroupIDs second_copy(second);