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

iface-modem-simple: SIM-PIN2 locking does not prevent from connecting

Browse Source
This commit is contained in:
Aleksander Morgado
2012-02-17 10:52:28 +01:00
parent c176117941
commit dc1df5bf2f
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mm-iface-modem-simple.c
View File

@@ -360,8 +360,11 @@ unlock_check_ready (MMIfaceModem *self,
return; return;
} }
/* If we are already unlocked, go on to next step */ /* If we are already unlocked, go on to next step. Note that we do also
if (lock == MM_MODEM_LOCK_NONE) { * allow SIM-PIN2, as we don't need to unlock that in order to get
* connected. */
if (lock == MM_MODEM_LOCK_NONE ||
lock == MM_MODEM_LOCK_SIM_PIN2) {
ctx->step++; ctx->step++;
connection_step (ctx); connection_step (ctx);
return; return;

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

@@ -1712,7 +1712,9 @@ set_lock_status (MMIfaceModem *self,
if (lock == MM_MODEM_LOCK_NONE || if (lock == MM_MODEM_LOCK_NONE ||
lock == MM_MODEM_LOCK_SIM_PIN2 || lock == MM_MODEM_LOCK_SIM_PIN2 ||
lock == MM_MODEM_LOCK_SIM_PUK2) { lock == MM_MODEM_LOCK_SIM_PUK2) {
if (old_lock != MM_MODEM_LOCK_NONE) { if (old_lock != MM_MODEM_LOCK_NONE &&
old_lock != MM_MODEM_LOCK_SIM_PIN2 &&
old_lock != MM_MODEM_LOCK_SIM_PUK2) {
/* Notify transition from UNKNOWN/LOCKED to DISABLED */ /* Notify transition from UNKNOWN/LOCKED to DISABLED */
mm_iface_modem_update_state (self, mm_iface_modem_update_state (self,
MM_MODEM_STATE_DISABLED, MM_MODEM_STATE_DISABLED,