Modify the timing of sd_notify(READY) and adjust the timeout for dbus reply calls to 10 seconds

+
Modify LICENSE to LICENSE.Apache-2.0

Change-Id: I3cbfde4b7c573a2bca0559446c19981650b52cd4
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
(cherry picked from commit ba489059760ab2eee0e31b1d86d2b1c73fb713a3)

4 files changed, 13 insertions, 19 deletions

diff --git a/LICENSE b/LICENSE.Apache-2.0
index 8f17f505..8f17f505 100644
--- a/LICENSE
+++ b/LICENSE.Apache-2.0
diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index 0303b8bc..6018ce70 100755
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -452,7 +452,7 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files
 %manifest %{name}.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %config %{_sysconfdir}/dbus-1/system.d/deviced.conf
 %{_unitdir}/multi-user.target.wants/deviced.service
 %{_unitdir}/sockets.target.wants/deviced.socket
@@ -471,7 +471,7 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files profile_mobile
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced.mobile
 # TIZEN_FEATURE_LAZY_MOUNT == on
 # battery_module
@@ -490,7 +490,7 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files profile_wearable
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced.wearable
 # battery_module
 %config %{_sysconfdir}/deviced/battery.conf
@@ -499,28 +499,28 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files profile_tv
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced.tv
 #if #{?display_module} == on ==> always on
 %config %{_sysconfdir}/deviced/display-tv.conf
 
 %files profile_common
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced.common
 #if #{?display_module} == on ==> always on
 %config %{_sysconfdir}/deviced/display-common.conf
 
 %files profile_ivi
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced.ivi
 #if #{?display_module} == on ==> always on
 %config %{_sysconfdir}/deviced/display-ivi.conf
 
 %files tools
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/devicectl
 #if #{?usb_module} == on ==> always on
 %{_bindir}/direct_set_debug.sh
@@ -529,7 +529,7 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files -n libdeviced
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %defattr(-,root,root,-)
 %{_libdir}/libdeviced.so.*
 
@@ -541,6 +541,6 @@ mv %{_bindir}/deviced %{_bindir}/deviced.ivi
 
 %files auto-test
 %manifest deviced.manifest
-%license LICENSE
+%license LICENSE.Apache-2.0
 %{_bindir}/deviced-auto-test
 %config %{_sysconfdir}/deviced/auto-test.conf
diff --git a/src/core/main.c b/src/core/main.c
index 5a148db8..9408f1d5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -73,13 +73,6 @@ static Eina_Bool watchdog_cb(void *data)
 	return ECORE_CALLBACK_RENEW;
 }
 
-static gboolean deviced_notify(gpointer data)
-{
-	_I("sd_notify(READY=1)");
-	sd_notify(0, "READY=1");
-	return G_SOURCE_REMOVE;
-}
-
 static int deviced_main(int argc, char **argv)
 {
 	int ret;
@@ -106,7 +99,8 @@ static int deviced_main(int argc, char **argv)
 			_E("aw_register failed");
 	}
 
-	g_idle_add(deviced_notify, NULL);
+	_I("sd_notify(READY=1)");
+	sd_notify(0, "READY=1");
 
 	ecore_main_loop_begin();
 
diff --git a/src/shared/dbus.c b/src/shared/dbus.c
index 43d9f474..ca90e035 100755
--- a/src/shared/dbus.c
+++ b/src/shared/dbus.c
@@ -27,8 +27,8 @@
 #include "log.h"
 #include "dbus.h"
 
-/* -1 is a default timeout value, it's converted to 25*1000 internally. */
-#define DBUS_REPLY_TIMEOUT	(-1)
+/* 10 seconds */
+#define DBUS_REPLY_TIMEOUT	(10000)
 
 struct pending_call_data {
 	dbus_pending_cb func;