Merge pull request #151 from jkangas/master

Request for pulling LTE configuration bug fix to main branch
[rilmodem] Force GSM WCDMA configuration in very first start
2014-01-15 00:46:33 -08:00 · 2014-01-14 12:31:51 +02:00
1 changed files with 6 additions and 4 deletions
--- a/ofono/drivers/rilmodem/radio-settings.c
+++ b/ofono/drivers/rilmodem/radio-settings.c
@@ -215,12 +215,12 @@ static gboolean ril_get_net_config(struct radio_data *rsd)

 	g_key_file_set_list_separator(keyfile, ',');

-	if (!g_key_file_load_from_file(keyfile, path, 0, &err)) {
-		g_error_free(err);
-		return needsconfig;
-	} else {
+	if (g_key_file_load_from_file(keyfile, path, 0, &err)) {
 		if (g_key_file_has_group(keyfile, LTE_FLAG))
 			rsd->ratmode = PREF_NET_TYPE_LTE_GSM_WCDMA;
+	} else {
+		g_error_free(err);
+		needsconfig = TRUE;
 	}

 	g_key_file_free(keyfile);
@@ -233,6 +233,8 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
 	if (alreadyset[0])
 		value = g_key_file_get_boolean(
 			keyfile, alreadyset[0], LTE_FLAG, NULL);
+	else if (rsd->ratmode == PREF_NET_TYPE_GSM_WCDMA_AUTO)
+		value = TRUE;

 	if (!value && rsd->ratmode == PREF_NET_TYPE_LTE_GSM_WCDMA) {
 			g_key_file_set_boolean(keyfile,