Skip to content

Fix #13490 Cellular disconnect does not deactivate context #13610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 13, 2020
Merged

Fix #13490 Cellular disconnect does not deactivate context #13610

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8483d59
Fix #13490 Cellular disconnect does not deactivate context
boraozgen Sep 10, 2020
9f24c04
Apply astyle
boraozgen Sep 21, 2020
0604c49
Apply suggestion from review
boraozgen Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion connectivity/cellular/source/framework/AT/AT_CellularContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ nsapi_error_t AT_CellularContext::find_and_activate_context()
delete_current_context();
} else if (err == NSAPI_ERROR_OK) {
_is_context_active = true;
_is_context_activated = true;
}

_at.unlock();
Expand Down Expand Up @@ -755,8 +756,9 @@ void AT_CellularContext::check_and_deactivate_context()
rat = reg_params._act;
// 3GPP TS 27.007:
// For EPS, if an attempt is made to disconnect the last PDN connection, then the MT responds with ERROR
if (_is_context_active && (rat < CellularNetwork::RAT_E_UTRAN || active_contexts_count > 1)) {
if (_is_context_active && (rat < CellularNetwork::RAT_E_UTRAN || rat == CellularNetwork::RAT_NB1 || active_contexts_count > 1)) {
_at.clear_error();

deactivate_context();
}

Expand Down