From: Yu A Wang <arron.wang@intel.com>
Date: Thu, 24 Nov 2011 11:52:44 +0000 (-0500)
Subject: ofono: Do not call set_connected() from the activation reply
X-Git-Tag: 0.78~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1bd1ce5f07f16cb0ffef2aab1dc6732ea9ca9337;p=platform%2Fupstream%2Fconnman.git

ofono: Do not call set_connected() from the activation reply

As the IP setting may not be set when getting the activation D-Bus reply,
set_connected should not be called at that point but rather from
the context_changed routine.

Fixes BMC#24284
---

diff --git a/plugins/ofono.c b/plugins/ofono.c
index bcb79ae..625e25b 100644
--- a/plugins/ofono.c
+++ b/plugins/ofono.c
@@ -528,13 +528,11 @@ static void set_active_reply(DBusPendingCall *call, void *user_data)
 		connman_error("SetProperty(Active) %s %s",
 				error.name, error.message);
 
-		if (connman_network_get_index(info->network) < 0)
-			connman_network_set_error(info->network,
+		connman_network_set_error(info->network,
 				CONNMAN_NETWORK_ERROR_ASSOCIATE_FAIL);
 
 		dbus_error_free(&error);
-	} else if (connman_network_get_index(info->network) >= 0)
-		set_connected(info, TRUE);
+	}
 
 done:
 	dbus_message_unref(reply);