From e11c1afdd34e0c66bc415d20e60da1cec60c5d40 Mon Sep 17 00:00:00 2001 From: Jussi Kangas Date: Wed, 5 Mar 2014 16:10:23 +0200 Subject: [PATCH] [network] Do not check the service table before reading SPDI Although it is correct to check support for service provider display info from service table before reading, operators don't necessarily care about such details. Direct reading is the surest way to find out if the info is present or not. If it is not, ofono will just get failure from modem. Signed-off-by: Jussi Kangas --- ofono/src/network.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ofono/src/network.c b/ofono/src/network.c index ce68c675..1775b143 100644 --- a/ofono/src/network.c +++ b/ofono/src/network.c @@ -2106,18 +2106,14 @@ void ofono_netreg_register(struct ofono_netreg *netreg) ofono_sim_add_spn_watch(netreg->sim, &netreg->spn_watch, spn_read_cb, netreg, NULL); - if (__ofono_sim_service_available(netreg->sim, - SIM_UST_SERVICE_PROVIDER_DISPLAY_INFO, - SIM_SST_SERVICE_PROVIDER_DISPLAY_INFO)) { - ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID, - OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, - sim_spdi_read_cb, netreg); + ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID, + OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, + sim_spdi_read_cb, netreg); - ofono_sim_add_file_watch(netreg->sim_context, - SIM_EFSPDI_FILEID, - sim_spdi_changed, - netreg, NULL); - } + ofono_sim_add_file_watch(netreg->sim_context, + SIM_EFSPDI_FILEID, + sim_spdi_changed, + netreg, NULL); } __ofono_atom_register(netreg->atom, netreg_unregister);