eliminate heynoti related part

Change-Id: Id0e2a7176ca0e71a078f16cbef6357b81f50cefc

diff --git a/inc/AppService.h b/inc/AppService.h
index 76db253..987dd28 100644 (file)
--- a/inc/AppService.h
+++ b/inc/AppService.h
@@ -23,6 +23,7 @@
 #include <FAppServiceApp.h>
 #include <FAppPkgIPackageInstallationEventListener.h>
 #include <FSysIBootEventListener.h>
+#include <FApp_Aul.h>
 
 #include <FApp_IAppManagerEventListener.h>
 
@@ -88,7 +89,7 @@ public:
        // IBootEventListener
        virtual void OnBootCompleted(void);
 
-       static void OnPowerOffNotiReceived(void* pData);
+       static void OnPowerOffNotiReceived(keynode_t* node, void* pData);
        static void OnSystemServiceTerminated(int arg);
        static AppService* __pAppService;
 

diff --git a/plugins/nfc-condition-handler/NfcConditionHandler.cpp b/plugins/nfc-condition-handler/NfcConditionHandler.cpp
index f390315..6094bdd 100644 (file)
--- a/plugins/nfc-condition-handler/NfcConditionHandler.cpp
+++ b/plugins/nfc-condition-handler/NfcConditionHandler.cpp
@@ -36,7 +36,6 @@
 
 #include <FBaseSysLog.h>
 #include <FBase_StringConverter.h>
-#include <FApp_Aul.h>
 #include <FApp_AppLaunchConditionHandlerBase.h>
 
 

diff --git a/src/AppService.cpp b/src/AppService.cpp
index 589a54c..57aadc7 100644 (file)
--- a/src/AppService.cpp
+++ b/src/AppService.cpp
@@ -173,15 +173,28 @@ AppService::OnAppInitialized(void)
 }
 
 void
-AppService::OnPowerOffNotiReceived(void* pData)
+AppService::OnPowerOffNotiReceived(keynode_t* node, void* user_data)
 {
-       SysLog(NID_APP, "'power_off_start' noti received from system-server with 0x%x.", pData);
-
-       AppService* pAppService = static_cast<AppService*>(pData);
-       if (pAppService)
+       int value = -1;
+       if (!vconf_get_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, &value))
        {
-               SysLog(NID_APP, "osp-app-service is terminating now.");
-               pAppService->Terminate();
+               if (value == VCONFKEY_SYSMAN_POWER_OFF_DIRECT || value == VCONFKEY_SYSMAN_POWER_OFF_RESTART)
+               {
+                       SysLog(NID_APP, "'power_off_start' noti received from system-server with 0x%x.", user_data);
+
+                        if (vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS, AppService::OnPowerOffNotiReceived))
+                        {
+                                SysLog(NID_APP, "Fail to ignore vconf for key(%s)", VCONFKEY_SYSMAN_POWER_OFF_STATUS);
+                        }
+
+                       AppService* pAppService = static_cast<AppService*>(user_data);
+                       if (pAppService)
+                       {
+                               SysLog(NID_APP, "osp-app-service is terminating now.");
+                               pAppService->Terminate();
+                       }
+
+               }
        }
 }