Removed is_suspended setter.

is_suspended flag was encapsulated inside resumption controller
Updated mocks

1 files changed, 11 insertions, 8 deletions

diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index bf7a365b9e..435e621169 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -264,19 +264,19 @@ bool ResumeCtrlImpl::RemoveApplicationFromSaved(
 
 void ResumeCtrlImpl::OnSuspend() {
   LOG4CXX_AUTO_TRACE(logger_);
-  StopSavePersistentDataTimer();
-  SaveAllApplications();
-  resumption_storage_->Persist();
+  is_suspended_ = true;
+  FinalPersistData();
 }
 
 void ResumeCtrlImpl::OnIgnitionOff() {
   LOG4CXX_AUTO_TRACE(logger_);
   resumption_storage_->IncrementIgnOffCount();
-  OnSuspend();
+  FinalPersistData();
 }
 
 void ResumeCtrlImpl::OnAwake() {
   LOG4CXX_AUTO_TRACE(logger_);
+  is_suspended_ = false;
   ResetLaunchTime();
   StartSavePersistentDataTimer();
 }
@@ -285,10 +285,6 @@ bool ResumeCtrlImpl::is_suspended() const {
   return is_suspended_;
 }
 
-void ResumeCtrlImpl::set_is_suspended(const bool suspended_flag) {
-  is_suspended_ = suspended_flag;
-}
-
 void ResumeCtrlImpl::StartSavePersistentDataTimer() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (!save_persistent_data_timer_.is_running()) {
@@ -447,6 +443,13 @@ void ResumeCtrlImpl::SaveDataOnTimer() {
   }
 }
 
+void ResumeCtrlImpl::FinalPersistData() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  StopSavePersistentDataTimer();
+  SaveAllApplications();
+  resumption_storage_->Persist();
+}
+
 bool ResumeCtrlImpl::IsDeviceMacAddressEqual(
     ApplicationSharedPtr application, const std::string& saved_device_mac) {
   LOG4CXX_AUTO_TRACE(logger_);