Make sure to call wakeup manager deinitialize()

Change-Id: I6f2457fe8fb4b3bffe45309a091fae2d2a014015

diff --git a/wakeup-manager/inc/wakeup_manager.h b/wakeup-manager/inc/wakeup_manager.h
index 5027b90643489b97a7c132c87e923d3892d41485..f9bc137f5a4674e46925f457339bc50261e6684d 100644 (file)
--- a/wakeup-manager/inc/wakeup_manager.h
+++ b/wakeup-manager/inc/wakeup_manager.h
@@ -275,6 +275,8 @@ private:
 #ifdef LOG_RECORDER_ENABLED
        Ecore_Timer* mPeriodicLogRecorderResetTimer{nullptr};
 #endif // LOG_RECORDER_ENABLED
+
+       bool mInitialized{false};
 };
 
 } // wakeup

diff --git a/wakeup-manager/src/wakeup_manager.cpp b/wakeup-manager/src/wakeup_manager.cpp
index 9da1763841c9987337c41647a2139adcfa4230f7..8cdfefcc36af49d09fa14ead9bb64335ab59ccc7 100644 (file)
--- a/wakeup-manager/src/wakeup_manager.cpp
+++ b/wakeup-manager/src/wakeup_manager.cpp
@@ -112,6 +112,9 @@ CWakeupManager::CWakeupManager(IWakeupEventObserver* wakeup_observer, ISettingVa
 CWakeupManager::~CWakeupManager()
 {
        MWR_LOGI("Wakeup Manager is now being destroyed");
+       if (mInitialized) {
+               deinitialize();
+       }
 }
 
 void CWakeupManager::initialize_wakeup_policy()
@@ -182,6 +185,8 @@ bool CWakeupManager::initialize()
        initialize_wakeup_policy();
        start_periodic_monitor_timer();
 
+       mInitialized = true;
+
        MWR_LOGD("[END]");
        return true;
 }
@@ -216,6 +221,8 @@ bool CWakeupManager::deinitialize()
        mWakeupSettings.deinitialize();
        mAssistantLanguageInfo.clear();
 
+       mInitialized = false;
+
        MWR_LOGE("[END]");
        return true;
 }