Ignore EFli if the first entry is empty

This commit is contained in:
Denis Kenzior 2009-09-23 17:28:15 -05:00
parent 2a02f45c79
commit dc644108bf
1 changed files with 11 additions and 4 deletions

View File

@ -1092,12 +1092,19 @@ skip_efpl:
* order of preference following TS 31.102. * order of preference following TS 31.102.
* Quoting 31.102 Section 5.1.1.2: * Quoting 31.102 Section 5.1.1.2:
* The preferred language selection shall always use the EFLI in * The preferred language selection shall always use the EFLI in
* preference to the EFPL at the MF unless... * preference to the EFPL at the MF unless:
* - if the EFLI has the value 'FFFF' in its highest priority position,
* then the preferred language selection shall be the language
* preference in the EFPL at the MF level
* Otherwise in order of preference according to TS 51.011 * Otherwise in order of preference according to TS 51.011
*/ */
if (efli_format) if (efli_format) {
sim->language_prefs = concat_lang_prefs(efli, efpl); if (sim->efli_length >= 2 && sim->efli[0] == 0xff &&
else sim->efli[1] == 0xff)
sim->language_prefs = concat_lang_prefs(NULL, efpl);
else
sim->language_prefs = concat_lang_prefs(efli, efpl);
} else
sim->language_prefs = concat_lang_prefs(efpl, efli); sim->language_prefs = concat_lang_prefs(efpl, efli);
if (efli) { if (efli) {