summaryrefslogtreecommitdiff
path: root/src/components/application_manager/src/policies/policy_handler.cc
diff options
context:
space:
mode:
authorSKobziev <skobziev@luxoft.com>2018-10-25 15:20:50 +0300
committerSKobziev <skobziev@luxoft.com>2018-10-26 11:55:24 +0300
commit072bba71a3b553da369dd8b8e63edf94ab61bff6 (patch)
treeb4a98e0f584df6e1b7b6411bcaa08defd13aa92a /src/components/application_manager/src/policies/policy_handler.cc
parent0d5b3c4dc01844880f46b752076278578b77781f (diff)
parentd36316738785c96dab2ee892762ed08c059fffde (diff)
downloadsdl_core-072bba71a3b553da369dd8b8e63edf94ab61bff6.tar.gz
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/application_manager/src/policies/policy_handler.cc')
-rw-r--r--src/components/application_manager/src/policies/policy_handler.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index cbc434a485..1b64c5d7b4 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -951,6 +951,7 @@ void PolicyHandler::OnVehicleDataUpdated(
void PolicyHandler::OnPendingPermissionChange(
const std::string& policy_app_id) {
+ LOG4CXX_AUTO_TRACE(logger_);
LOG4CXX_DEBUG(logger_,
"PolicyHandler::OnPendingPermissionChange for "
<< policy_app_id);
@@ -989,8 +990,6 @@ void PolicyHandler::OnPendingPermissionChange(
if (permissions.appPermissionsConsentNeeded) {
MessageHelper::SendOnAppPermissionsChangedNotification(
app->app_id(), permissions, application_manager_);
-
- policy_manager_->RemovePendingPermissionChanges(policy_app_id);
// "Break" statement has to be here to continue processing in case of
// there is another "true" flag in permissions struct
break;
@@ -1000,8 +999,6 @@ void PolicyHandler::OnPendingPermissionChange(
if (permissions.isAppPermissionsRevoked) {
MessageHelper::SendOnAppPermissionsChangedNotification(
app->app_id(), permissions, application_manager_);
-
- policy_manager_->RemovePendingPermissionChanges(policy_app_id);
}
break;
}
@@ -1022,15 +1019,14 @@ void PolicyHandler::OnPendingPermissionChange(
commands::Command::SOURCE_SDL);
application_manager_.OnAppUnauthorized(app->app_id());
-
- policy_manager_->RemovePendingPermissionChanges(policy_app_id);
}
if (permissions.requestTypeChanged || permissions.requestSubTypeChanged) {
MessageHelper::SendOnAppPermissionsChangedNotification(
app->app_id(), permissions, application_manager_);
- policy_manager_->RemovePendingPermissionChanges(policy_app_id);
}
+
+ policy_manager_->RemovePendingPermissionChanges(policy_app_id);
}
bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,