SRA dev.

src/ue/nas/mm/base.cpp

@@ -246,14 +246,6 @@ void NasMm::onSwitchCmState(ECmState oldState, ECmState newState)
 
             switchRmState(ERmState::RM_DEREGISTERED);
         }
-        else if (m_mmState == EMmState::MM_REGISTERED)
-        {
-            switchMmState(EMmState::MM_REGISTERED, EMmSubState::MM_REGISTERED_PLMN_SEARCH);
-        }
-        else if (m_mmState == EMmState::MM_DEREGISTERED)
-        {
-            switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_PLMN_SEARCH);
-        }
     }
 }
 

src/ue/nas/mm/radio.cpp

@@ -208,6 +208,11 @@ void NasMm::handleRadioLinkFailure()
     m_usim->m_currentPlmn = std::nullopt;
 
     handleRrcConnectionRelease();
+
+    if (m_mmState == EMmState::MM_REGISTERED)
+        switchMmState(EMmState::MM_REGISTERED, EMmSubState::MM_REGISTERED_NA);
+    else if (m_mmState == EMmState::MM_DEREGISTERED)
+        switchMmState(EMmState::MM_DEREGISTERED, EMmSubState::MM_DEREGISTERED_NA);
 }
 
 void NasMm::localReleaseConnection()