Added support for GSM in the modemmgr plugin.

src/service.c

Index: src/service.c
diff --git a/src/service.c b/src/service.c
index ba2df0525453dbf6bc42449194839ab480965a92..112b02472a88f9fff1896c7810ce5a189528edf6 100644
--- a/src/service.c
+++ b/src/service.c
@@ -390,22 +390,6 @@ static const char *activation_state2string(
 	return NULL;
 }
 
-static enum connman_network_activation_state string2activation_state(
-		const char *state)
-{
-	if (g_strcmp0(state, "unknown") == 0)
-		return CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN;
-	else if (g_strcmp0(state, "activated") == 0)
-		return CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATED;
-	else if (g_strcmp0(state, "activating") == 0)
-		return CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATING;
-	else if (g_strcmp0(state, "not-activated") == 0)
-		return CONNMAN_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED;
-	else if (g_strcmp0(state, "partially-activated") == 0)
-		return CONNMAN_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED;
-	return CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN;
-}
-
 static const char *network_technology2string(
 	enum connman_network_cellular_technology technology)
 {
@@ -414,6 +398,8 @@ static const char *network_technology2string(
 		return "1xRTT";
 	case CONNMAN_NETWORK_TECHNOLOGY_EVDO:
 		return "EVDO";
+	case CONNMAN_NETWORK_TECHNOLOGY_GSM:
+		return "GSM";
 	case CONNMAN_NETWORK_TECHNOLOGY_GPRS:
 		return "GPRS";
 	case CONNMAN_NETWORK_TECHNOLOGY_EDGE:
@@ -1564,8 +1550,6 @@ void __connman_service_set_activation_state(struct connman_service *service,
 	enum connman_network_activation_state activation_state,
 	enum connman_element_error err)
 {
-	struct connman_device *device;
-
 	const char *state = activation_state2string(activation_state);
 
 	if (err != CONNMAN_ELEMENT_ERROR_UNKNOWN) {
@@ -1575,16 +1559,7 @@ void __connman_service_set_activation_state(struct connman_service *service,
 				CONNMAN_SERVICE_STATE_ACTIVATION_FAILURE);
 	}
 
-	if (service->cellular.activation_state != activation_state) {
-		service->cellular.activation_state = activation_state;
-		if (activation_state == CONNMAN_NETWORK_ACTIVATION_STATE_ACTIVATED) {
-			device = connman_service_get_device(service);
-			if (device != NULL)
-				__connman_device_set_modem_update_time(device);
-		}
-		__connman_storage_save_service(service);
-	}
-
+	service->cellular.activation_state = activation_state;
 	/* NB: connman_dbus_send_property_changed logs msg on failure */
 	(void) connman_dbus_send_property_changed_variant(service->path,
 		CONNMAN_SERVICE_INTERFACE, "Cellular.ActivationState",
@@ -1673,28 +1648,32 @@ void __connman_service_set_registration_info(
 		enum connman_network_cellular_technology network_technology,
 		enum connman_network_cellular_roaming_state roaming_state)
 {
-	enum connman_network_cellular_technology otech =
-			service->cellular.network_technology;
-	enum connman_network_cellular_roaming_state oroam =
-			service->cellular.roaming_state;
-	const char *tech_str = network_technology2string(network_technology);
-	const char *roam_str = roaming_state2string(roaming_state);
-
-	service->cellular.network_technology = network_technology;
-	service->cellular.roaming_state = roaming_state;
-	if (otech != network_technology && tech_str != NULL) {
-		(void) connman_dbus_send_property_changed_variant(
-				service->path,
-				CONNMAN_SERVICE_INTERFACE,
-				"Cellular.NetworkTechnology",
-				DBUS_TYPE_STRING, &tech_str);
-	}
-	if (oroam != roaming_state && roam_str != NULL) {
-		(void) connman_dbus_send_property_changed_variant(
-				service->path,
-				CONNMAN_SERVICE_INTERFACE,
-				"Cellular.RoamingState",
-				DBUS_TYPE_STRING, &roam_str);
+	const char *tech_str;
+	const char *roam_str;
+
+	if (network_technology != CONNMAN_NETWORK_TECHNOLOGY_UNKNOWN) {
+		tech_str = network_technology2string(network_technology);
+		if (service->cellular.network_technology != network_technology &&
+		    tech_str != NULL) {
+			(void) connman_dbus_send_property_changed_variant(
+					service->path,
+					CONNMAN_SERVICE_INTERFACE,
+					"Cellular.NetworkTechnology",
+					DBUS_TYPE_STRING, &tech_str);
+		}
+		service->cellular.network_technology = network_technology;
+	}
+	if (roaming_state != CONNMAN_NETWORK_ROAMING_STATE_UNKNOWN) {
+		roam_str = roaming_state2string(roaming_state);
+		if (service->cellular.roaming_state != roaming_state &&
+		    roam_str != NULL) {
+			(void) connman_dbus_send_property_changed_variant(
+					service->path,
+					CONNMAN_SERVICE_INTERFACE,
+					"Cellular.RoamingState",
+					DBUS_TYPE_STRING, &roam_str);
+		}
+		service->cellular.roaming_state = roaming_state;
 	}
 }
 
@@ -3809,13 +3788,6 @@ static int service_load(struct connman_service *service)
 		if (error == NULL)
 			service->autoconnect = autoconnect;
 		g_clear_error(&error);
-		str = g_key_file_get_string(keyfile,
-					    service->identifier,
-					    "Cellular.ActivationState", NULL);
-		if (str != NULL) {
-			service->cellular.activation_state =
-					string2activation_state(str);
-		}
 		break;
 	default:
 		break;
@@ -3966,14 +3938,6 @@ update:
 		if (service->favorite == TRUE)
 			g_key_file_set_boolean(keyfile, service->identifier,
 					"AutoConnect", service->autoconnect);
-		if (service->cellular.activation_state !=
-		    CONNMAN_NETWORK_ACTIVATION_STATE_UNKNOWN)
-			g_key_file_set_string(
-				keyfile,
-				service->identifier,
-				"Cellular.ActivationState",
-				activation_state2string(
-					service->cellular.activation_state));
 		break;
 	default:
 		break;