forked from sailfishos/ofono
[rilmodem] Force GSM WCDMA configuration in very first start
There was a bug in previous solution where GSM WCDMA was set only if previous configuration was defined. This fix forces the GSM WCDMA configuration always if configured. Signed-off-by: Jussi Kangas <jussi.kangas@oss.tieto.com>
This commit is contained in:
@@ -215,12 +215,12 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
|
|||||||
|
|
||||||
g_key_file_set_list_separator(keyfile, ',');
|
g_key_file_set_list_separator(keyfile, ',');
|
||||||
|
|
||||||
if (!g_key_file_load_from_file(keyfile, path, 0, &err)) {
|
if (g_key_file_load_from_file(keyfile, path, 0, &err)) {
|
||||||
g_error_free(err);
|
|
||||||
return needsconfig;
|
|
||||||
} else {
|
|
||||||
if (g_key_file_has_group(keyfile, LTE_FLAG))
|
if (g_key_file_has_group(keyfile, LTE_FLAG))
|
||||||
rsd->ratmode = PREF_NET_TYPE_LTE_GSM_WCDMA;
|
rsd->ratmode = PREF_NET_TYPE_LTE_GSM_WCDMA;
|
||||||
|
} else {
|
||||||
|
g_error_free(err);
|
||||||
|
needsconfig = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
g_key_file_free(keyfile);
|
g_key_file_free(keyfile);
|
||||||
@@ -233,6 +233,8 @@ static gboolean ril_get_net_config(struct radio_data *rsd)
|
|||||||
if (alreadyset[0])
|
if (alreadyset[0])
|
||||||
value = g_key_file_get_boolean(
|
value = g_key_file_get_boolean(
|
||||||
keyfile, alreadyset[0], LTE_FLAG, NULL);
|
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) {
|
if (!value && rsd->ratmode == PREF_NET_TYPE_LTE_GSM_WCDMA) {
|
||||||
g_key_file_set_boolean(keyfile,
|
g_key_file_set_boolean(keyfile,
|
||||||
|
|||||||
Reference in New Issue
Block a user