From: sinikang <sinikang@samsung.com>
Date: Mon, 9 Apr 2018 09:23:57 +0000 (+0900)
Subject: Remove retry timer
X-Git-Tag: accepted/tizen/unified/20180410.063638^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0aa701e7b2d3bb09e08cc4da156646d05a20ffdf;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-manager.git

Remove retry timer
 - Retry for AddPoweroffWait is no longer needed
   becasuse deviced has been fixed the dbus error issue.

Change-Id: Icd445608bcb33894baa7ebccfc3a78c267d57040
---

diff --git a/include/manager_modem.h b/include/manager_modem.h
index 29617cb..c2bb5ed 100644
--- a/include/manager_modem.h
+++ b/include/manager_modem.h
@@ -33,7 +33,6 @@ struct system_power_info {
 	guint subs_id_power_off;
 	int state;
 	gboolean set_poweroff_wait;
-	gint set_poweroff_timer;
 };
 
 struct manager_modem_private_info {
diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index 5eb0bad..10194e9 100644
--- a/packaging/tel-plugin-manager.spec
+++ b/packaging/tel-plugin-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 10
+%define patchlevel 11
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}
@@ -11,7 +11,7 @@ Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:	pkgconfig(gio-2.0)
+BuildRequires:	  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(tcore)
diff --git a/src/manager_modem.c b/src/manager_modem.c
index f11b98f..9c42cfe 100644
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -357,39 +357,10 @@ static void __manager_modem_poweroff_unsubscribe_signal(ModemPrivateInfo *modem_
 
 	modem_info->sys_power.set_poweroff_wait = FALSE;
 
-	/* Remove Timer */
-	if (modem_info->sys_power.set_poweroff_timer > 0) {
-		g_source_remove(modem_info->sys_power.set_poweroff_timer);
-		modem_info->sys_power.set_poweroff_timer = -1;
-	}
-
 	dbg("done");
 
 }
 
-static gboolean __manager_modem_poweroff_wait_retry(gpointer user_data)
-{
-	ModemPrivateInfo *modem_info = user_data;
-
-	dbg("enter");
-
-	if (G_UNLIKELY(!modem_info)) {
-		err("Invalid data");
-		return FALSE;
-	}
-
-	/* Remove Timer */
-	if (modem_info->sys_power.set_poweroff_timer > 0) {
-		g_source_remove(modem_info->sys_power.set_poweroff_timer);
-		modem_info->sys_power.set_poweroff_timer = -1;
-	}
-	__manager_modem_add_poweroff_wait(modem_info);
-
-	dbg("done");
-
-	return TRUE;
-}
-
 static void __manager_modem_add_poweroff_wait_cb(GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
 	GError *error = NULL;
@@ -405,7 +376,6 @@ static void __manager_modem_add_poweroff_wait_cb(GObject *source_object, GAsyncR
 	if (error) {
 		err("Failed: %s", error->message);
 		g_error_free(error);
-		modem_info->sys_power.set_poweroff_timer = g_timeout_add(MANAGER_RETRY_TIMEOUT, __manager_modem_poweroff_wait_retry, modem_info);
 	} else {
 		dbg("PoweroffWait Added Successufully");
 		modem_info->sys_power.set_poweroff_wait = TRUE;
@@ -512,9 +482,6 @@ gboolean manager_modem_initialize_private_info(ModemBoard *mb)
 	mb->modem_info->co_modem = tcore_plugin_ref_core_object(mb->modem_plugin, CORE_OBJECT_TYPE_MODEM);
 	mb->modem_info->modem_status = MODEM_STATE_UNKNOWN;
 
-
-	mb->modem_info->sys_power.set_poweroff_timer = -1;
-
 	if (mb->index == MANAGER_MODEM_BOARD_INDEX_0) {
 		dbg("__manager_power_subscribe_signal() for modem index (%d)", mb->index);
 		__manager_modem_poweroff_subscribe_signal(mb->modem_info);