Merge pull request #192 from jkangas/next

Request for pulling direct SPDI reading without service table check to next branch
This commit is contained in:
Jarko Poutiainen
2014-03-06 11:40:37 +02:00
committed by Martti Piirainen

View File

@@ -2106,9 +2106,6 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
ofono_sim_add_spn_watch(netreg->sim, &netreg->spn_watch, ofono_sim_add_spn_watch(netreg->sim, &netreg->spn_watch,
spn_read_cb, netreg, NULL); 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_read(netreg->sim_context, SIM_EFSPDI_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_spdi_read_cb, netreg); sim_spdi_read_cb, netreg);
@@ -2118,7 +2115,6 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
sim_spdi_changed, sim_spdi_changed,
netreg, NULL); netreg, NULL);
} }
}
__ofono_atom_register(netreg->atom, netreg_unregister); __ofono_atom_register(netreg->atom, netreg_unregister);