colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm-iface-modem: don't attempt to check lock status when current active slot have eSIM without profiles

Browse Source 
Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/630
This commit is contained in:
Jack Song
2022-09-19 16:11:48 +08:00
parent 4ab2c80858
commit ab80c31898
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mm-iface-modem.c
View File

@@ -5905,17 +5905,28 @@ interface_initialization_step (GTask *task)
ctx->step++; ctx->step++;
/* fall-through */ /* fall-through */
case INITIALIZATION_STEP_UNLOCK_REQUIRED: case INITIALIZATION_STEP_UNLOCK_REQUIRED: {
/* Only check unlock required if we were previously not unlocked */ g_autoptr(MMBaseSim) sim = NULL;
if (mm_gdbus_modem_get_unlock_required (ctx->skeleton) != MM_MODEM_LOCK_NONE) {
mm_iface_modem_update_lock_info (self, g_object_get (self,
MM_MODEM_LOCK_UNKNOWN, /* ask */ MM_IFACE_MODEM_SIM, &sim,
(GAsyncReadyCallback)modem_update_lock_info_ready, NULL);
task); /* If the current SIM is an eSIM without profiles, we ignore
return; * unlock required. */
if (sim && mm_base_sim_is_esim_without_profiles (sim))
mm_obj_dbg (self, "not unlock required: eSIM without profiles");
else {
/* Only check unlock required if we were previously not unlocked */
if (mm_gdbus_modem_get_unlock_required (ctx->skeleton) != MM_MODEM_LOCK_NONE) {
mm_iface_modem_update_lock_info (self,
MM_MODEM_LOCK_UNKNOWN, /* ask */
(GAsyncReadyCallback)modem_update_lock_info_ready,
task);
return;
}
} }
ctx->step++; ctx->step++;
/* fall-through */ } /* fall-through */
case INITIALIZATION_STEP_SIM: case INITIALIZATION_STEP_SIM:
/* If the modem doesn't need any SIM (not implemented by plugin, or not /* If the modem doesn't need any SIM (not implemented by plugin, or not