From 8afcfa1b4d633ae3e293cff2c72db0c9eb68c5a6 Mon Sep 17 00:00:00 2001
From: "taesub.kim" <taesub.kim@samsung.com>
Date: Mon, 2 Dec 2013 09:03:11 +0900
Subject: [PATCH] Handle flight mode changing after wifi on/off

Change-Id: I1c2de163b12a2e8315dc11b6e07d2666ea52e7bc
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
---
 include/wifi-power.h      |  2 ++
 packaging/net-config.spec |  2 +-
 src/signal-handler.c      |  3 +++
 src/wifi-power.c          | 50 +++++++++++++++++++++++++++++++++++++++++------
 4 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/include/wifi-power.h b/include/wifi-power.h
index e6b3ecb..6e4eef9 100644
--- a/include/wifi-power.h
+++ b/include/wifi-power.h
@@ -26,6 +26,8 @@ extern "C" {
 
 #include <glib.h>
 
+void netconfig_set_power_in_progress(gboolean in_progress);
+void netconfig_check_fm_waiting(void);
 void netconfig_wifi_power_configuration(void);
 
 gboolean netconfig_iface_wifi_load_driver(NetconfigWifi *wifi, GError **error);
diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index df8e343..628c57f 100644
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:       net-config
 Summary:    TIZEN Network Configuration Module
-Version:    0.1.90_24
+Version:    0.1.90_25
 Release:    1
 Group:      System/Network
 License:    Apache License Version 2.0
diff --git a/src/signal-handler.c b/src/signal-handler.c
index be35e06..4c2b5bc 100644
--- a/src/signal-handler.c
+++ b/src/signal-handler.c
@@ -106,6 +106,9 @@ static void __netconfig_technology_signal_handler(DBusMessage *msg)
 				netconfig_wifi_update_power_state(TRUE);
 			else
 				netconfig_wifi_update_power_state(FALSE);
+
+			netconfig_set_power_in_progress(FALSE);
+			netconfig_check_fm_waiting();
 		} else if (g_strcmp0(key, "Connected") == 0) {
 			/* Connection state */
 		} else if (g_strcmp0(key, "Tethering") == 0) {
diff --git a/src/wifi-power.c b/src/wifi-power.c
index 7017793..6eb0fea 100644
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -42,6 +42,8 @@
 
 #define WLAN_DRIVER_SCRIPT "/usr/bin/wlan.sh"
 
+static gboolean power_in_progress = FALSE;
+static gboolean fm_waiting = FALSE;
 
 static gboolean __netconfig_wifi_enable_technology(void)
 {
@@ -174,13 +176,12 @@ static void __netconfig_wifi_direct_state_cb(int error_code,
 
 	if (device_state == WIFI_DIRECT_DEVICE_STATE_DEACTIVATED) {
 		if (__netconfig_wifi_try_to_load_driver() < 0) {
+			power_in_progress = FALSE;
 
 			/* TODO: error report */
 
 			return;
 		}
-
-		netconfig_wifi_notify_power_completed(TRUE);
 	}
 }
 
@@ -213,9 +214,10 @@ static int __netconfig_wifi_try_to_load_driver(void)
 	}
 
 	if (netconfig_is_wifi_direct_on() == TRUE) {
-		if (__netconfig_wifi_direct_power_off() == TRUE)
+		if (__netconfig_wifi_direct_power_off() == TRUE) {
+			power_in_progress = TRUE;
 			return -EINPROGRESS;
-		else
+		} else
 			return -EBUSY;
 	}
 
@@ -225,7 +227,12 @@ static int __netconfig_wifi_try_to_load_driver(void)
 		return -EIO;
 	}
 
-	__netconfig_wifi_enable_technology();
+	if (__netconfig_wifi_enable_technology() != TRUE) {
+		netconfig_wifi_remove_driver();
+		return -EIO;
+	}
+
+	power_in_progress = TRUE;
 
 	return 0;
 }
@@ -236,7 +243,10 @@ static gboolean __netconfig_wifi_try_to_remove_driver(void)
 
 	netconfig_wifi_statistics_update_powered_off();
 
-	__netconfig_wifi_disable_technology();
+	if (__netconfig_wifi_disable_technology() != TRUE)
+		return FALSE;
+
+	power_in_progress = TRUE;
 
 	return TRUE;
 }
@@ -248,6 +258,13 @@ static void __netconfig_wifi_airplane_mode(keynode_t* node,
 	int wifi_state = 0;
 	static gboolean powered_off_by_flightmode = FALSE;
 
+	if (power_in_progress) {
+		fm_waiting = TRUE;
+		return;
+	}
+
+	fm_waiting = FALSE;
+
 	vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &value);
 	vconf_get_int(VCONFKEY_WIFI_STATE, &wifi_state);
 
@@ -317,6 +334,17 @@ static void __netconfig_wifi_pm_state_mode(keynode_t* node,
 	prev_state = value;
 }
 
+void netconfig_set_power_in_progress(gboolean in_progress)
+{
+	power_in_progress = in_progress;
+}
+
+void netconfig_check_fm_waiting(void)
+{
+	if (fm_waiting)
+		__netconfig_wifi_airplane_mode(NULL, NULL);
+}
+
 void netconfig_wifi_power_configuration(void)
 {
 	int wifi_last_power_state = 0;
@@ -350,6 +378,11 @@ gboolean netconfig_iface_wifi_load_driver(NetconfigWifi *wifi, GError **error)
 		return FALSE;
 	}
 
+	if (power_in_progress) {
+		netconfig_error_wifi_driver_failed(error);
+		return FALSE;
+	}
+
 	err = __netconfig_wifi_try_to_load_driver();
 	if (err < 0) {
 		if (err == -EINPROGRESS)
@@ -369,6 +402,11 @@ gboolean netconfig_iface_wifi_remove_driver(NetconfigWifi *wifi, GError **error)
 
 	g_return_val_if_fail(wifi != NULL, FALSE);
 
+	if (power_in_progress) {
+		netconfig_error_wifi_driver_failed(error);
+		return FALSE;
+	}
+
 	if (__netconfig_wifi_try_to_remove_driver() != TRUE) {
 		netconfig_error_wifi_driver_failed(error);
 
-- 
2.7.4