Merge pull request #1137 from VVeremjova/fix/StartPTUFlowAfterRegistrationApp

Fix RegisterApp flow

3 files changed, 3 insertions, 4 deletions

diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 5c77f70787..f89b5e5caf 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -564,8 +564,6 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
   applications_.insert(application);
   applications_list_lock_.Release();
 
-  GetPolicyHandler().AddApplication(application->policy_app_id());
-
   return application;
 }
 
diff --git a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
index 471a54336d..64c42de7e7 100644
--- a/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/src/commands/mobile/register_app_interface_request.cc
@@ -642,10 +642,10 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile() {
   // relies on HMI level.
   application_manager_.OnApplicationRegistered(application);
 
+  // Start PTU after successfull registration
   // Sends OnPermissionChange notification to mobile right after RAI response
   // and HMI level set-up
-  application_manager_.GetPolicyHandler().OnAppRegisteredOnMobile(
-      application->policy_app_id());
+  GetPolicyHandler().OnAppRegisteredOnMobile(application->policy_app_id());
 
   if (result_code != mobile_apis::Result::RESUME_FAILED) {
     resumer.StartResumption(application, hash_id);
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index 6278a43889..5f0f876f13 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -1690,6 +1690,7 @@ void PolicyHandler::OnAppsSearchCompleted() {
 
 void PolicyHandler::OnAppRegisteredOnMobile(const std::string& application_id) {
   POLICY_LIB_CHECK_VOID();
+  AddApplication(application_id);
   policy_manager_->OnAppRegisteredOnMobile(application_id);
 }