sailfishos/ofono
1
0
Fork 1
mirror of https://github.com/sailfishos/ofono synced 2025-11-23 10:59:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #189 from jkangas/next

Browse Source 
Request for pulling usage of preset paths when reading ADN records to next branch
This commit is contained in:
Miia Leinonen
2014-03-03 16:58:41 +02:00
committed by Martti Piirainen
parent b489dc995b d25fd17f09
commit 95b95f9af9
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ofono/drivers/rilmodem/phonebook.c
View File

@@ -1107,15 +1107,27 @@ static void pb_reference_data_cb(const struct ofono_error *error,
pbd->pb_reference_file_info.record_length)) {
pbd->pb_reference_file_info.record++;
DBG("Next EFpbr record %d", pbd->pb_reference_file_info.record);
pbd->sim_driver->read_file_linear(get_sim(),
pbd->pb_reference_file_info.
file_id,
pbd->pb_reference_file_info.
record,
pbd->pb_reference_file_info.
record_length,
NULL, 0,
pb_reference_data_cb, cbd);
if (RIL_APPTYPE_SIM == ril_get_app_type()) {
pbd->sim_driver->read_file_linear(get_sim(),
pbd->pb_reference_file_info.
file_id,
pbd->pb_reference_file_info.
record,
pbd->pb_reference_file_info.
record_length,
sim_path, sizeof(sim_path),
pb_reference_data_cb, cbd);
} else {
pbd->sim_driver->read_file_linear(get_sim(),
pbd->pb_reference_file_info.
file_id,
pbd->pb_reference_file_info.
record,
pbd->pb_reference_file_info.
record_length,
usim_path, sizeof(usim_path),
pb_reference_data_cb, cbd);
}
} else {
struct pb_file_info *file_info;
DBG("All EFpbr records read");