diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-10-02 18:43:10 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-10-02 18:43:10 -0400 |
| commit | 7ed7e819828a1957b0f4b27e4f13ff99ed81c230 (patch) | |
| tree | 0f862ecff0225af37c57919bdb1d41abcf09cbd6 /src/components/application_manager | |
| parent | 6912633eda53949395f8825dc0abdb2d03a2dbdf (diff) | |
| download | sdl_core-7ed7e819828a1957b0f4b27e4f13ff99ed81c230.tar.gz | |
Fix issue where pending permissions were not being cleared
Diffstat (limited to 'src/components/application_manager')
| -rw-r--r-- | src/components/application_manager/src/policies/policy_handler.cc | 10 |
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, |